ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-23 23:12:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,134 Commits 989 Branches 212 Tags 191 MiB
480da3476e
Commit Graph

259 Commits

Author SHA1 Message Date
Victor Woeltjen
eaaa1a19ca [JSDoc] Remove obsolete module references 
WTD-1482
 2015-08-07 11:55:38 -07:00
Victor Woeltjen
c08a460d30 [JSDoc] Add annotations 
Bulk-add JSDoc annotations, WTD-1482.
 2015-08-07 11:44:54 -07:00
Pete Richards
48a9eef924 Merge branch 'open-master' into open-965 2015-08-06 16:13:37 -07:00
Pete Richards
c80e9bfa26 [Style] JSLint Compliance 2015-08-06 15:21:28 -07:00
Pete Richards
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
Pete Richards
19b80ded16 Merge remote-tracking branch 'origin/open1423' into open-965 2015-08-06 15:10:52 -07:00
Pete Richards
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
Shivam Dave
63a99f26f6 Merge branch 'mobile_3' into mobile 2015-08-06 14:13:13 -07:00
Shivam Dave
7ca15a9de2 [Mobile] Representation 
Edited grid item to center
shared button.
 2015-08-06 14:11:59 -07:00
Shivam Dave
0bc4f2dc6e Merge remote-tracking branch 'upstream/master' into mobile 2015-08-06 13:45:37 -07:00
Pete Richards
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
larkin
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
Shivam Dave
9b922913a0 [Mobile] Gestures 
Added styling to back and selection
arrow (tree). Also increased the space
allowed for selection arrow on tree item.
Info Button created on grid items for mobile.
Info bubble appears on tablet like desktop.
Also on mobile, info bubble fits to width.
New QueryService that returns if on iPhone.
Also formatted dialog box so that their is no
margin and takes up fullscreen on mobile.
 2015-08-04 09:59:08 -07:00
Shivam Dave
560a2e035e [Mobile] Info Button 
Added info button to grid/list items
on mobile. When the button is pressed,
info bubble appears for 750ms or the
same infobutton is pressed to dismiss
immediately.
 2015-07-31 11:13:52 -07:00
Shivam Dave
2d1aa65d63 [Mobile] Test 
BrowseController test adjusted to
repeat less code.
 2015-07-30 12:50:39 -07:00
Shivam Dave
12ec293f3d [Mobile] Tests 
Changed BrowseController and RemoveActionSpec to account
for grandparent and navigation usage. Also changed
RemoveAction variable name.
 2015-07-29 13:57:11 -07:00
Shivam Dave
bdf8b4d3f1 [Mobile] Test for Back Arrow 
Added tests for the backarrow and
when it appears/disappears.
 2015-07-29 13:22:47 -07:00
Shivam Dave
97bf530b1d [Mobile] BackArrow 
Removed the BackArrow console log
that was getting called in the
BrowseController.
 2015-07-29 11:41:10 -07:00
Shivam Dave
7e35e55f0b [Mobile] Hide Back Button 
When you are at the highest level the
back button fades out and is unclickable.
When you are able to go up a level the
back button appears/fades in and is
pressable. Also removed the object type
name from the header.
 2015-07-29 11:13:09 -07:00
Shivam Dave
7cc14a195b [Mobile] Tests/Header 
Removes back arrow on desktops.
Also added queryService to tests
for the context menu action and
gesture.
 2015-07-29 10:00:03 -07:00
Shivam Dave
356fa73c91 [Mobile] Tests 
Test created for backArrow
that spies on all objects
used to find parent.
 2015-07-28 15:55:22 -07:00
Shivam Dave
a073ef69ac [Mobile] Back Arrow 
Shifted Back Arrow down to
align with header.
 2015-07-28 15:15:42 -07:00
Shivam Dave
3c6c420023 [Mobile] Back Arrow 
Back Arrow implemented
by getting parent and then
navigating to it.
 2015-07-28 15:08:14 -07:00
Shivam Dave
2a4943f584 [Mobile] Console 
Removed call to console so
mvn clean install would compile.
 2015-07-28 10:58:22 -07:00
Shivam Dave
e32403a75f [Mobile] Clean-Up 
Cleaned the unused code for the
backArrow and long touch gestures.
Commented out functions for later use
Currently shows the back arrow, however,
only will print to console on press.
Edited tests where mobile checks were breaking
and fixed.
 2015-07-28 10:56:29 -07:00
Shivam Dave
b0c42c12b7 [Mobile] Back Arrow 
Changes URL correctly that
is printed to the console. Is the
url to up one level of objects.
However not navigating to that
object.
 2015-07-27 17:01:30 -07:00
Shivam Dave
621ccc25ec [Mobile] Back Arrow HTML 
Created HTMl for back arrow,
next neew to hook up a click.
 2015-07-27 15:31:47 -07:00
Shivam Dave
6e43a92191 [Mobile] Merge 
Fix Conflicts.
 2015-07-27 15:21:59 -07:00
shale
6b02295bf4 Merge branch 'master' of https://github.com/nasa/openmctweb into search 2015-07-24 14:20:27 -07:00
Victor Woeltjen
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
shale
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
shale
7d495f6389 [Search] Hide tree 
The tree is hidden when there are
search results.
 2015-07-23 15:55:20 -07:00
Shivam Dave
d115166dde [Mobile] Comments 
Added comments and removed
unwanted spec test code for
BrowseController.
 2015-07-23 13:48:21 -07:00
Shivam Dave
d176f9f811 [Mobile] Test 
Fixed BrowseControllerSpec.js to
account for the .treeslide
call and added a new test for thatasds
 2015-07-23 13:46:46 -07:00
shale
c65a278fcf [Search] Selecting results works 
Can now click on search results. The view will
be updated, as well as the selected object
being higlighted.
 2015-07-23 10:50:00 -07:00
shale
b16af5fe3e [Search] Renaming search and searchbar 
Changed what was previously just 'search' and
renamed to 'search view'. Then, took what was
previously 'searchbar' and renamed to
'search'.
 2015-07-22 15:43:28 -07:00
Shivam Dave
7aba3b6672 [Mobile] Clean Up 
Removed gap below bottom bar. Moved
around constants for the resizing
of the tree. Also added comments in
layout and reformatted that slightly.
 2015-07-22 12:53:49 -07:00
shale
b5f8e6d90c [Search] Updating searchbar 
Updating the searchbar to be again more
similar to the search view. It now has
a 'load more' button, but it is not
clickable for some reason. In progress.
 2015-07-21 16:21:23 -07:00
Shivam Dave
56e51ea32a [Mobile] Reformat of menu 
Reformats menu to move the
arrow to the right and now
that is what selects an object.
Pressing the actual menu item will
enact the dropdown menu. This
only happens on mobile platforms.
 2015-07-21 13:29:45 -07:00
Shivam Dave
ce6d74390e [Mobile] Clean-Up 
Removed unnecessary classes. Also added
comments and adjusted menu sizes.
 2015-07-20 09:39:06 -07:00
Shivam Dave
0d7387080d [Mobile] Create Menu 
Create menu text has ellipsis
attribute now, so if text is cut off
it will have a '...' appended to it.
Also added comments to mixins.
 2015-07-17 10:28:19 -07:00
Shivam Dave
488829a20c [Mobile] Header 
Removed type from header
along with the right side buttons.
 2015-07-16 16:13:58 -07:00
Shivam Dave
85c7a36e25 [Mobile] Cleaned up 
Set the width of the create menu
text/components to fit the menu
however it gets cuttoff sometimes.
Next steps are to Clean up screen,
change the create menu to fit the left side,
and fix bottom space.
 2015-07-16 15:21:17 -07:00
Shivam Dave
d99b4d75d8 [Mobile] Fix 
Fixed the desktop version breaking.
CUrrent issue is hte menu is getting cut off.
 2015-07-16 14:07:25 -07:00
Shivam Dave
15a88967d0 [Mobile] Transition/Create Fix 
Fix the create button to work and
also transition well. Added transition mixin
to stay DRY.
 2015-07-16 13:22:07 -07:00
Shivam Dave
6e6fbe0d65 [Mobile] Transitions 
Made transitions properly work for
create button.
 2015-07-16 12:54:10 -07:00
Shivam Dave
e9314898d2 [Mobile] Portrait & Landsc. 
Specifies amounts based on phone and tablet's
orientation. Not tested for the actual device,
but emulator. Also currently makes the create
button appear/disappear instead of smoothly sliding.
 2015-07-16 11:50:55 -07:00
Shivam Dave
ce75d19480 [Mobile] Desktop 
Cleans up the _layout by making the different
pane sizes device specific. Also adds a new
sass class just for desktop versions.
 2015-07-16 10:44:20 -07:00
shale
6f2ad0dadc [Search] Renaming and adding files 
Renamed QueryService as SearchService and changed
the corresponding references to it. Added a
SearchAggregator file and related files. Not
yet begun with the implementation.
 2015-07-16 10:10:07 -07:00
Shivam Dave
4b5540830b [Mobile] Slide menu 
Rouch menu using important to
overwrite splitter setting of
amounts. Also has default values
for now for all devices.
 2015-07-15 16:49:16 -07:00
shale
3fcf061679 Merge branch 'master' of https://github.com/nasa/openmctweb into search-explore 2015-07-15 16:15:25 -07:00
shale
b94ef695e2 [Search] Creating searchbar 
Starting to create a search bar which lives
in the same side of the divder as the file
tree does.
 2015-07-15 13:29:45 -07:00
Shivam Dave
54b6cd1100 [Mobile] Debug 
Added debug statement to print
to console.
 2015-07-15 13:28:42 -07:00
shale
1455e5d8b5 [Browse] Removed destroy functions 
Removed destroy functions from menu arrow
controller and contetxt menu action as
suggested. #33, #47.
 2015-07-14 13:25:25 -07:00
Shivam Dave
6f07a21bb8 [Mobile] Clean-up 
Cleaned up scss and also, the
edit/new tab/full screen buttons are
hidden in mobile, temporarily.
 2015-07-14 13:10:28 -07:00
Shivam Dave
edcafc5835 [Mobile] Remove Bar 
Remove the splitter bar on mobile
and tablets.
 2015-07-13 13:56:44 -07:00
Dave
635e1eda69 [Mobile] Clean-Up 
Removed unused menu button and
cleaned up treeCl to be treeClass.
 2015-07-09 15:14:36 -07:00
Dave
dfd08000f1 [Mobile] Adjust 
Adjusted the tablet amount
that the slide occurs.
 2015-07-09 13:42:07 -07:00
Dave
82c8d26264 [Mobile] 
Now does not display
the icon for the slide menu
on desktops.
 2015-07-09 11:16:41 -07:00
Dave
bd236e1cb1 [Mobile] Icon 
Added menu/hamburger icon.
 2015-07-09 11:06:25 -07:00
Dave
e47a36e799 [Mobile] Simplified 
treeSlide now uses one line that
sets it to true or false simply
like a switch. So not matter what
it will either slide or not.
 2015-07-09 10:55:52 -07:00
Dave
30efec0090 [Mobile] Angular 
Replaced document usage with
angular calls that change the ternary
op to flip the slide.
 2015-07-09 10:53:03 -07:00
Dave
b9371ea03d [Mobile] Moved Button 
Button moved to the Browse.html
and BrowseController handles the
tree slide.
 2015-07-09 10:28:45 -07:00
Dave
07ef4dfe8a [Mobile] Menu Slide 
Menu slides, but not transition
css slides out on click. Currently
uses document, which needs to be
replaced with angular version using
 and/or  and/or
ng-class and/or ng-click.
 2015-07-08 14:27:59 -07:00
Dave
3704d64560 [Mobile] Push to show current 2015-07-08 11:08:31 -07:00
Dave
24fae72492 [Mobile] Left tree 
Attempt to resize left
tree menu when changing device.
Currently does not move the splitter
bar.
 2015-07-07 16:46:32 -07:00
Sarah Hale
b2a23ee968 [Browse] Tests completed 
Completed the menu arrow controller test. All
tests are now completed. #33.
 2015-07-07 09:28:01 -07:00
Shivam Dave
d8806f14aa [Mobile] Set viewport 
Viewport has been set in
index.html. Then what was
implemented prior to this
(rem-display and browser-manage)
was commented out.
 2015-07-07 09:08:16 -07:00
Shivam Dave
0c6a9ca857 [Mobile] Styles 
Added new style to set the width
of the tree.
 2015-07-06 13:15:38 -07:00
Sarah Hale
2b67ae42bf [Browse] Gesture and action tests 
The menu gesture and the menu action tests
are completed. #33.
 2015-07-02 14:00:54 -07:00
Sarah Hale
db920a7b5c [Browse] Starting tests 
Created new test files for the additions. #33.
 2015-07-02 12:50:48 -07:00
Sarah Hale
2524c75505 [Browse] Menu arrow works 
The menu arrow now displays a context menu
when clicked. #33.
 2015-07-02 12:36:35 -07:00
Sarah Hale
c08f972ab4 [Browse] Menu action called correctly 
Both the menu gesture and the menu arrow now
correctly call the menu action. #33.
 2015-07-02 11:57:03 -07:00
Sarah Hale
4e6301edb4 [Browse] Fixed multiple clicks 
Fixed having multiple calls to ContextMenuGesture. #33.
 2015-07-02 10:58:19 -07:00
Sarah Hale
3edd967e27 [Browse] Changed action key 
Changed the key for the context menu action from
'contextMenu' to 'menu'. #33.
 2015-07-02 10:30:45 -07:00
Sarah Hale
bb80b2175c [Browse] Gesture calling action 
The context menu gesture (attempts) to call the
context menu action. The menu arrow still fails
to call. #33.
 2015-07-02 09:36:19 -07:00
Sarah Hale
e9989ae00d [Browse] Some progress 
Still doesn't work.
 2015-07-01 14:32:49 -07:00
Charles Hacskaylo
7e89c13839 [Frontend] Markup updates to label and grid-item 
WTD-1423
Depends on CSS and font updates in 2a032bf
 2015-07-01 09:50:53 -07:00
Charles Hacskaylo
e0727e8485 [Frontend] Markup and CSS for link icon indicators 
WTD-1423
Added small icon to upper right;
IN PROGRESS;
 2015-06-30 18:13:17 -07:00
Charles Hacskaylo
d5d7ac90ac [Frontend] Markup and CSS for link icon indicators 
WTD-1423
Grid item version with link at bottom right of main icon;
 2015-06-30 17:58:56 -07:00
Sarah Hale
9ad1c25d53 [Browse] Splitting up Menu Gesture 
Splitting up the context menu gesture's functionality into
separate context menu gesture and context menu actions.
The gesture watches for right-clicks, while the action
displays the menu. #33.
 2015-06-30 16:17:00 -07:00
Sarah Hale
4840345524 [Browse] Stopped multiple broadcasts 
Stopped the menu arrow from making multiple
broadcasts of contextmenu. #33.
 2015-06-30 15:22:10 -07:00
Sarah Hale
917d98bd3e [Browse] Created Menu Arrow 
Created a menu-arrow respresentation. #33.
 2015-06-30 13:33:40 -07:00
Charles Hacskaylo
9d25e3081f [Frontend] Edit mode refactored to use new mct-split-pane 
WTD-1404
WTD-1399
 2015-06-30 13:23:56 -07:00
Charles Hacskaylo
c24a459f66 [Frontend] Plot legend minor cleanups 
WTD-1404
WTD-1386
 2015-06-30 10:38:10 -07:00
Charles Hacskaylo
abef44f37d [Frontend] Moved browse mode splitter settings to CSS file 
WTD-1404
WTD-1399
 2015-06-30 10:37:19 -07:00
Victor Woeltjen
1c4cca3f91 Merge branch 'open1392b' into open-master 2015-06-29 16:30:48 -07:00
Victor Woeltjen
ef77ca91e7 Merge branch 'open1363' into open-master 2015-06-29 16:27:10 -07:00
Victor Woeltjen
970698c77b Merge remote-tracking branch 'nasa/open1392' into open1392b 
Conflicts:
	platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
	platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
	platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
	platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
 2015-06-29 16:09:01 -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
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
Charles Hacskaylo
0fd1fb709b [Config] Fix for priority of New Tab button 
WTD-1392
WTD-1359
Set "Open in new tab" button to have priority "preferred";
Set fullscreen mode button to priority "default";
Tweaked full screen button tooltip text;
 2015-06-26 15:36:55 -07:00
Shivam Dave
d42abfef98 [Addressability] Comments 
Added comments to the slight change in Browse
Controller and BrowseObjectController. WTD 25.
 2015-06-26 12:58:16 -07:00
Shivam Dave
2e716bdbe3 [Addressability} Unit Test 
Completed unit tests to accomodate
for url path check prior to setting
the current . WTD 23.
 2015-06-26 12:51:25 -07:00
Shivam Dave
3de4473159 [Addressability] Re-Edit Bug 
Fixed re-edit but by implementing
what Victor said in issue #25. Adding
check on /browse/ part of url and then
changing route works WTD 23.
 2015-06-26 11:52:03 -07:00
Shivam Dave
2a347f1596 [Windowing] urlService 
Removed the urlService from the edit
and browse bundles. Added the urlService
to the general bundle. WTD 23.
 2015-06-25 14:53:52 -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