f27e4d6e06
Merge branch 'open-master' into open1482c
...
Merge in latest in preparation to merge; WTD-1482
Conflicts:
platform/commonUI/browse/src/creation/CreationService.js
platform/core/src/models/RootModelProvider.js
platform/entanglement/src/services/LinkService.js
platform/entanglement/src/services/MoveService.js
2015-08-19 15:00:52 -07:00
a4a9acd2ea
Merge branch 'open-master' into open-965
...
Merge in latest into topic branch for WTD-965 to
resolve conflicts.
Conflicts:
platform/commonUI/general/res/css/theme-espresso.css
2015-08-19 14:16:56 -07:00
f4b87cf70d
[Project source] Updated icomoon.io symbols font project file
2015-08-17 15:47:28 -07:00
366ec3d516
[Frontend] Styles for tabular views and view sections
...
Original issue: https://github.jpl.nasa.gov/MissionControl/vista/issues/30
New CSS and symbols to support tabular views;
Required by JPL branch vista30 (https://github.jpl.nasa.gov/MissionControl/vista/tree/vista30 )
2015-08-17 15:11:27 -07:00
bf417a14e0
Merge remote-tracking branch 'origin/open-master' into open1482c
...
Merge latest into topic branch for WTD-1482
2015-08-17 11:01:39 -07:00
3492cd3942
[Code Style] Fix bug introduced by refactor
...
Do some extra checking, since capabilities may have
properties which are note methods. WTD-1482.
2015-08-12 13:57:17 -07:00
94531a39d0
Merge branch 'master' of https://github.com/nasa/openmctweb into searchservice
2015-08-12 13:17:17 -07:00
c450c22ddd
[Code Style] Satisfy JSLint
...
Add missing semicolons etc. to satisfy JSLint after
changes for WTD-1482.
2015-08-11 13:03:06 -07:00
aa08db1050
[Code Style] Avoid copying window/scope
...
Avoids Angular errors; WTD-1482.
2015-08-11 11:00:56 -07:00
de291ad3b1
[Code Style] Use prototypes in inspection bundle
...
WTD-1482
2015-08-11 10:00:56 -07:00
140d767026
[Code Style] Use prototypes in general UI bundle
...
WTD-1482.
2015-08-11 09:47:54 -07:00
be5cad212a
[Code Style] Use prototypes in Edit bundle
...
WTD-1482.
2015-08-10 16:38:13 -07:00
efc42aa8f2
[Code Style] Use prototypes in Dialog bundle
...
WTD-1482.
2015-08-10 12:53:55 -07:00
f8a0ddb484
[Code Style] Avoid retaining reference to window
...
Avoid https://docs.angularjs.org/error/ng/cpws
by changing way reference to is retained.
WTD-1482.
2015-08-10 12:39:56 -07:00
a77920bd18
[Code Style] Use prototypes in Browse bundle
...
WTD-1482.
2015-08-10 11:52:23 -07:00
78146d97f8
[Code Style] Use prototypes in About bundle
...
WTD-1482.
2015-08-10 10:19:02 -07:00
a7a1ac70e5
[JSDoc] Remove obsolete module references
...
WTD-1482.
2015-08-07 12:14:40 -07:00
31eb366e7f
[JSDoc] Add namespace docs
...
WTD-1482.
2015-08-07 12:13:15 -07:00
eaaa1a19ca
[JSDoc] Remove obsolete module references
...
WTD-1482
2015-08-07 11:55:38 -07:00
c08a460d30
[JSDoc] Add annotations
...
Bulk-add JSDoc annotations, WTD-1482.
2015-08-07 11:44:54 -07:00
48a9eef924
Merge branch 'open-master' into open-965
2015-08-06 16:13:37 -07:00
c80e9bfa26
[Style] JSLint Compliance
2015-08-06 15:21:28 -07:00
ec62c27f36
[Representations] grid-item and label display links
...
grid-item and label representations now use the "location" capability
to determine whether or not to show a link indicator.
2015-08-06 15:12:02 -07:00
19b80ded16
Merge remote-tracking branch 'origin/open1423' into open-965
2015-08-06 15:10:52 -07:00
f72f88adfa
[Location] Use parent id as location
...
Use the parent id as the location for a model.
This greatly reduces the recursive work that must be done
during move operations to keep the location accurate.
Additionally, the locationService now implements a method
`persistLocation` which can be used to persist the current object
location as it's original location.
2015-08-06 15:05:47 -07:00
449db4f3a9
[Templates] Add stubs for link indicator
...
Update templates to use the location capability to show an indicator.
2015-08-06 14:52:42 -07:00
37cd73c6e8
[Template] Move ng-click to parent node
...
Move the ng-click directive to the li element to match the element that receives
hover styles.
Fixes nasa/openmctweb#60 .
2015-08-05 17:11:30 -07:00
40e85b718d
[Creation] Store location of new objects
...
The creation service stores the location (the full path) to
the domain object as "model.location"
2015-08-04 11:24:50 -07:00
ec87ac7652
[Search] Comments
2015-08-04 10:37:47 -07:00
8f65c73c8a
[Search] Recompile CSS
...
To make changes to the Sass reflected.
2015-08-04 10:36:46 -07:00
35316dc31c
[Search] Clean up
...
Removed additional reference to searhc UI, as well
as correct persistence provider.
2015-08-04 10:35:15 -07:00
b6bb689ccc
[Search] Remove search UI files
...
Leaving only search service related files.
2015-08-04 10:31:52 -07:00
4439e1680d
[Search] Update CSS
...
Scrolling now does not move the search input
field. Load more text always stays on one line.
2015-08-03 13:49:53 -07:00
5569ef8b2d
Revert "[Search] Update CSS"
...
This reverts commit e05f16d780
2015-08-03 13:39:22 -07:00
e05f16d780
[Search] Update CSS
...
Slight tweak to the padding of the search view,
which affects where the top of the scroll bar
appears. Also removed the search scroll div
because it was unused.
2015-08-03 13:26:29 -07:00
32b58715c6
[Search] Fixed scrolling and layout edit
...
Changed the CSS so that scrolling for the tree and
search results works again. Additionally, layout
editing works again.
2015-07-28 12:33:22 -07:00
561d671181
[Search] Fix to pass test
...
Changing TreeNodeController's isSelected function
back to original, so that it doesn't break tests.
2015-07-28 09:50:50 -07:00
6b02295bf4
Merge branch 'master' of https://github.com/nasa/openmctweb into search
2015-07-24 14:20:27 -07:00
9435e75461
Merge remote-tracking branch 'slhale/open33' into open47b
...
Fix merge conflict in preparation to integrate nasa/openmctweb#47
Conflicts:
platform/commonUI/browse/res/templates/browse/object-header.html
2015-07-24 13:46:37 -07:00
9143f5febd
[Search] Comments and errors
...
Changed TreeNodeController slightly to do error
checking. Also updated some comments.
2015-07-24 13:03:18 -07:00
341218e8f6
[Search] Tree hide change
...
The tree is now hidden whenever there is
text in the search bar. (This allows for
the case when there are no search results,
but text in the search bar.)
2015-07-23 16:24:38 -07:00
7d495f6389
[Search] Hide tree
...
The tree is hidden when there are
search results.
2015-07-23 15:55:20 -07:00
0feab1965c
[Search] Attempt at scroll bars
...
Attempted to make the search results scroll,
but failed for now. Created a div for the
search results, load icon, and load more
button, which are the elements desired to
be scrolled. Did not work because search
result labels have absolute position text.
2015-07-23 15:12:13 -07:00
aa17d3034e
[Search] Fixed excessive calls to setSelection
...
There were excessive calls to TreeNodeController's
setSelection() due to a modification for search
compatibility. Changed to not call as often.
2015-07-23 13:32:15 -07:00
52a9fcf5d6
[Search] Changed highlight size
...
The search item highlight when selected or
hovered over is now talled, and the margin
between search items is reduced to
counteract any effect to spacing.
2015-07-23 13:29:11 -07:00
7b271dcb6b
[Search] Highlight transitions
...
Added transitions for when objects get
highlighted from selection or hover.
2015-07-23 13:14:20 -07:00
2680e466fa
[Search] Tree selection syncs
...
Selecting something in the search results now
also makes it selected in the filetree. It
remains selected even when the search results
are cleared. (The filetree does not
automatically expand to that position though.)
2015-07-23 12:47:21 -07:00
ebb5474b34
[Search] Hover and loading
...
Added styling to result items when they are
hovered over.
Also added a loading icon.
2015-07-23 11:41:17 -07:00
4759162bb7
[Search] Added right padding
...
Added padding to the right side of the
search holder to match the tree holder's
padding.
2015-07-23 11:08:31 -07:00
deba184103
[Search] Selection remains across queries
...
The selected object in the search results now
remains selected even after a new search is made.
It also will remain selected if it is clicked
on the file tree, but the file tree version is
not yet selected if it is clicked on the search
results list.
2015-07-23 10:56:38 -07:00
