Commit Graph

154 Commits

Author SHA1 Message Date
4b3ca316e1 [Treeview] Update tests
For the existence of ngModel
2015-08-20 11:50:44 -07:00
3f7b874b38 [Treeview] Remove console.log 2015-08-20 11:47:16 -07:00
d2bc8227c7 [Treeview] Create button and slide transition
Made the create button visible when the left
pane is closed. Added a transition between
opening and closing the pane.
2015-08-20 10:41:30 -07:00
62f7ca5a0a [Treeview] Treeview collapse toggle
Clicking on the pane tab now toggles the
treeview.
2015-08-19 16:57:11 -07:00
29b1cfa890 [Treeview] Rename variable for clarity
paneModel's pane to leftPane, for clarity
once a right pane is added.
2015-08-19 16:47:12 -07:00
e44e50823e [Treeview] Treeview collapse
Clicking on the pane tab now will make the treeview
invisible, and set the width to 0. BUT, this does
not immediately move the splitter bar, though it
does go to the correct width if clicked.
Needs more work.
2015-08-19 16:44:42 -07:00
4a730f875f [Treeview] Clicking toggles model property
Clicking on the pane tab icon toggles ngModel.pane
2015-08-19 16:29:55 -07:00
8108a3b81c [Treeview] Html style 2015-08-19 16:02:49 -07:00
b8958edf72 [Treeview] Fixing errors, commits 2015-08-19 16:00:51 -07:00
2b00b71da9 [Treeview] Error fixing
Trying to get mctSplitter error to be fixed.
Reverting to an extent.
2015-08-19 15:45:17 -07:00
9c912b62d3 [Treeview] Modified left splitter
Added a 'button' (which does not work yet). It
sticks out of the splitter like a tab.
2015-08-19 15:08:27 -07:00
ffd80ed42b [Treeview] Style
Changed indentation in the html
2015-08-19 13:12:37 -07:00
8dad6a3fd5 Merge browse files from branch 'mobile' into open72 2015-08-19 13:04:11 -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
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
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
b2a23ee968 [Browse] Tests completed
Completed the menu arrow controller test. All
tests are now completed. #33.
2015-07-07 09:28:01 -07:00
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
db920a7b5c [Browse] Starting tests
Created new test files for the additions. #33.
2015-07-02 12:50:48 -07:00
2524c75505 [Browse] Menu arrow works
The menu arrow now displays a context menu
when clicked. #33.
2015-07-02 12:36:35 -07:00
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
4e6301edb4 [Browse] Fixed multiple clicks
Fixed having multiple calls to ContextMenuGesture. #33.
2015-07-02 10:58:19 -07:00
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
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
e9989ae00d [Browse] Some progress
Still doesn't work.
2015-07-01 14:32:49 -07:00
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
4840345524 [Browse] Stopped multiple broadcasts
Stopped the menu arrow from making multiple
broadcasts of contextmenu. #33.
2015-06-30 15:22:10 -07:00
917d98bd3e [Browse] Created Menu Arrow
Created a menu-arrow respresentation. #33.
2015-06-30 13:33:40 -07:00
9d25e3081f [Frontend] Edit mode refactored to use new mct-split-pane
WTD-1404
WTD-1399
2015-06-30 13:23:56 -07:00
c24a459f66 [Frontend] Plot legend minor cleanups
WTD-1404
WTD-1386
2015-06-30 10:38:10 -07:00
abef44f37d [Frontend] Moved browse mode splitter settings to CSS file
WTD-1404
WTD-1399
2015-06-30 10:37:19 -07:00
1c4cca3f91 Merge branch 'open1392b' into open-master 2015-06-29 16:30:48 -07:00
ef77ca91e7 Merge branch 'open1363' into open-master 2015-06-29 16:27:10 -07:00
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
a0d5a1a196 [Common UI] Get split pane width from elements
WTD-1363.
2015-06-27 10:46:42 -07:00
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
72c812cdaa [Common UI] Enforce split pane min/max
WTD-1363.
2015-06-26 16:30:39 -07:00
39372ea9ca [Common UI] Use mct-split-pane in Browse
WTD-1363.
2015-06-26 16:21:20 -07:00
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
d42abfef98 [Addressability] Comments
Added comments to the slight change in Browse
Controller and BrowseObjectController. WTD 25.
2015-06-26 12:58:16 -07:00
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
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
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
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
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
93ba4ce715 [Windowing] Unit Test
Added Unit test adjustments for
the change in urlService (addition
of a separate function for getting
the url for a location, used by browse
controller. WTD 23.
2015-06-25 10:10:13 -07:00
ca6f44f7b6 [Windowing] URL Fix
The URL malformation was caused by the same
function returning the view and index path for
both the newtab window and the browse controller
window. As a result, the BrowseController now only
uses a path that excludes the view and index paths,
like before the UrlService was added. Another,
separate function uses this url for the location
and includes the view and index paths for new
tabs, in order to maintain the current view. WTD 23.
2015-06-25 09:47:58 -07:00
9ac6abe78f Merge remote-tracking branch 'nasa/open980' into open1342 2015-06-25 09:07:27 -07:00
bd9010e2bc [urlService] CleanUp/Refactor
Adjusted BrowseController's useRoute
to use the urlService instead. Also
adds urlService as a depency through
bundle. Unit test also adjusted to
account for a mockUrlService and
a different value being passed into
mockLocation.path(). WTD 16.
2015-06-24 14:06:09 -07:00
c827c40c03 [Windowing] used
Used  instead of window in the
NewTabAction. WTD 16.
2015-06-24 12:58:48 -07:00