ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-21 03:55:31 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
1,866 Commits 993 Branches 212 Tags 192 MiB
7e837c266d
Commit Graph

82 Commits

Author SHA1 Message Date
slhale
7e837c266d Merge branch 'master' of https://github.com/nasa/openmctweb into open73 
Conflicts:
	platform/commonUI/browse/res/templates/browse.html
 2015-08-25 14:59:13 -07:00
slhale
c3e5fbf713 [Inspector] Location does not include self 
Changed the object inspector's location getting
to not include the object itself in the
location, just its ancestors. #73.
 2015-08-25 13:06:15 -07:00
slhale
33d88ecce0 [Inspector] Update tests 
Updated the object inspector controller spec to test
for the different types of locations. #73.
 2015-08-24 16:16:15 -07:00
slhale
70324a2198 [Inspector] Separate primary and contextual locations 
The object inspector now finds both the contextual
location of the link and the primary location of
the original, if the selected object is a link. #73.
 2015-08-24 15:49:57 -07:00
slhale
c81e2dbb4a Merge branch 'master' of https://github.com/nasa/openmctweb into search 
Conflicts:
	platform/commonUI/general/src/controllers/TreeNodeController.js
	platform/persistence/elastic/src/ElasticSearchProvider.js
 2015-08-24 13:14:43 -07:00
slhale
454b96c3c9 Merge branch 'master' of https://github.com/nasa/openmctweb into open73 
Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
 2015-08-24 13:06:44 -07:00
slhale
b8eaea5624 [Inspector] Add tests 
Added tests for the object inspector controller.
Removed unused objectService dependency. #73.
 2015-08-24 13:01:38 -07:00
slhale
d877ee3ce3 [Inspector] Use metadata capability 
Instead of manually getting each entry for
the object inspector, just get the selected
object's metadata capability.
Still need to manually get the parents. #73.
 2015-08-24 12:32:31 -07:00
slhale
bbcb0e15c9 [Inspector] Location in tree 
Added a 'location' section for the inspector panel. Its
elements are clickable labels. #73.
 2015-08-21 13:19:49 -07:00
Victor Woeltjen
140d767026 [Code Style] Use prototypes in general UI bundle 
WTD-1482.
 2015-08-11 09:47:54 -07:00
Victor Woeltjen
31eb366e7f [JSDoc] Add namespace docs 
WTD-1482.
 2015-08-07 12:13:15 -07:00
Victor Woeltjen
c08a460d30 [JSDoc] Add annotations 
Bulk-add JSDoc annotations, WTD-1482.
 2015-08-07 11:44:54 -07:00
slhale
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
shale
6b02295bf4 Merge branch 'master' of https://github.com/nasa/openmctweb into search 2015-07-24 14:20:27 -07:00
shale
9143f5febd [Search] Comments and errors 
Changed TreeNodeController slightly to do error
checking. Also updated some comments.
 2015-07-24 13:03:18 -07:00
shale
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
shale
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
Sarah Hale
7b4ef142f5 [Browse] Fixed tree nodes 
Realized that this refers to a previously hidden arrow
at the main title at the top of the page. Reverted the
changes done to the tree nodes. #33.
 2015-06-30 13:32:25 -07:00
Sarah Hale
57eefd7316 [Browse] Context menu gesture called 
The context menu gesture is called when the user clicks
the arrow next to the title of a domain object. This does
not yet display the context menu. It also does not yet
distinguish between edit and browse mode. #33.
 2015-06-30 11:18:56 -07:00
Victor Woeltjen
ef77ca91e7 Merge branch 'open1363' into open-master 2015-06-29 16:27:10 -07:00
Victor Woeltjen
66f8ee7194 [Common UI] Fix min/max bounds of mct-split-pane 
WTD-1363. Use correct dimension (width or height)
when determining maximum splitter position.
 2015-06-29 11:54:40 -07:00
Victor Woeltjen
b524dc451f [Common UI] Remove unused function 
Remove obsolete function from mct-split-pane, WTD-1363
 2015-06-29 11:27:48 -07:00
Victor Woeltjen
8c5b497377 [Common UI] Tweak mct-split-pane 
Tweak mct-split-pane for use in timeline; particularly,
improve synchronization between views. WTD-1363.
 2015-06-27 11:59:18 -07:00
Victor Woeltjen
a0d5a1a196 [Common UI] Get split pane width from elements 
WTD-1363.
 2015-06-27 10:46:42 -07:00
Victor Woeltjen
c79b018c84 [Common UI] Remove obsolete checks 
Remove obsolete minimum/maximum checks, WTD-1363.
 2015-06-27 10:40:05 -07:00
Victor Woeltjen
a1eb15db77 [Common UI] Change min/max width handling in splitter 
In split pane, obey the min-width and max-width style properties
of first element within the pane. WTD-1363.
 2015-06-27 10:35:49 -07:00
Victor Woeltjen
72c812cdaa [Common UI] Enforce split pane min/max 
WTD-1363.
 2015-06-26 16:30:39 -07:00
Victor Woeltjen
39372ea9ca [Common UI] Use mct-split-pane in Browse 
WTD-1363.
 2015-06-26 16:21:20 -07:00
Victor Woeltjen
0ee76421e0 [Common UI] Add mct-splitter 
WTD-1363.
 2015-06-26 15:59:16 -07:00
Victor Woeltjen
243c832c25 [Common UI] Add mct-split-pane 
Add mct-split-pane directive, to simplify adding splitters.
WTD-1363.
 2015-06-26 15:32:37 -07:00
larkin
f9782f1f45 Merge remote-tracking branch 'origin/open1273' into open-1340 2015-06-26 15:03:19 -07:00
Shivam Dave
193df4fde3 [Windowing] Excess function 
Removed extra function from
urlService. WTD 23.
 2015-06-25 14:37:01 -07:00
Shivam Dave
6d28add055 [Windowing] urlService 
urlService added to the edit action
bundle.json in addition to being
implemented, however 2nd time edit
bug still occurring. Also fixed urlService
test suite. WTD 23.
 2015-06-25 13:16:15 -07:00
Shivam Dave
fd6459394a [Windowing] urlService 
Changed folder location of
services and therefore urlService
to general/src/ instead of being in
browse/src/. WTD 23.
 2015-06-25 10:38:39 -07:00
Victor Woeltjen
8199d1d9d9 [Plot] Use mct-drag from plot 
Use mct-drag from plot such that we are able to handle
mouse events which leave the plot area for marquee zoom
and pan. WTD-1273.
 2015-06-20 11:47:10 -07:00
Victor Woeltjen
bcb4e9c495 [Addressability] Remove excessive check 
Remove unneeded check from ViewSwitcherController; not necessary
to avoid overwriting query string selection of view. WTD-1149.
 2015-06-16 15:40:19 -07:00
Victor Woeltjen
d559dae1e2 [Addressability] Expose current view in query param 
Expose the currently selected view as a query string parameter,
WTD-1149.
 2015-06-16 15:09:42 -07:00
Victor Woeltjen
fec6f06849 [Addressability] Obey view query string param 
Obey the query string parameter for a view, if present.
WTD-1149.
 2015-06-16 14:58:03 -07:00
Victor Woeltjen
10863514cb [Licenses] Add license headers 
WTD-1051.
 2015-05-13 16:43:30 -07:00
bwyu
8673e2045e Merge remote-tracking branch 'origin/open987' into open-master 2015-03-16 10:28:55 -07:00
Victor Woeltjen
ee04814f59 Merge remote-tracking branch 'nasa/open1002' into open1015 
Merge in open1002, WTD-1015.

Conflicts:
	platform/commonUI/edit/res/templates/edit-object.html
 2015-03-12 11:32:17 -07:00
Victor Woeltjen
26ba75f636 [Forms] Update selector controller 
Update controller for domain object selector, for WTD-987.
 2015-03-09 17:26:37 -07:00
Victor Woeltjen
66e0d2fcfa [Forms] Complete initial selector 
Complete initial implementation of the domain object
selector for WTD-987.
 2015-03-09 17:16:31 -07:00
Victor Woeltjen
4146a2ad01 [Forms] Begin adding controller for selector 
Begin implementing controller to populate the domain
object selector, added for WTD-987.
 2015-03-09 17:03:28 -07:00
Charles Hacskaylo
feda668e18 [Frontend] Applied split pane functionality to edit mode 
WTD-1002
SplitPaneController added to edit-object.html;
CSS modded to remove positioning that is now under splitter control;
 2015-03-06 08:11:27 -08:00
Victor Woeltjen
86ee28740f [Common UI] Avoid infinite digest 
Avoid infinite digest when first applicy mct-scroll
directives, WTD-920.
 2015-03-03 13:50:39 -08:00
Victor Woeltjen
9fa09e25f0 [Common UI] Tweak mct-scroll-* directives 
Make fixes/tweaks to behavior of mct-scroll-x and mct-scroll-y
directives after testing them against timeline markup. WTD-920.
 2015-02-25 16:28:53 -08:00
Victor Woeltjen
9a88e5172a [Common UI] Expose mct-scroll-x, mct-scroll-y 
Expose mct-scroll-x and mct-scroll-y directives. WTD-920.
 2015-02-25 16:05:57 -08:00
Victor Woeltjen
f8b352c4d8 [Common UI] Implement mct-scroll-* parent 
Implement parent directive for mct-scroll-x, mct-scroll-y.
WTD-920.
 2015-02-25 16:01:38 -08:00
Victor Woeltjen
f11eced6b9 [Common UI] Add spec for MCT scroll directive parent 
Add spec for MCTScroll, which will act as a parent class
for mct-scroll-x and mct-scroll-y directives, WTD-920.
 2015-02-25 15:47:30 -08:00