d981e7bb1d
[Browse] Separate out back-arrow behavior
...
Supports integration of changes for mobile, nasa/openmct#95
2015-09-15 12:18:57 -07:00
a3a6706869
[Browse] Separate out back-arrow behavior
...
Supports integration of changes for mobile, nasa/openmct#95
2015-09-15 12:13:11 -07:00
72c122e0ee
Merge remote-tracking branch 'github/master' into open95b
...
Conflicts:
platform/commonUI/edit/src/actions/RemoveAction.js
2015-09-15 11:35:25 -07:00
de6dfe1fdc
Merge remote-tracking branch 'github/master' into mobile
...
Merge in latest from master into mobile branch
to reconcile conflicts
Conflicts:
platform/commonUI/edit/src/actions/RemoveAction.js
2015-09-10 15:01:38 -07:00
52df7fe1e2
[Angular] Avoid infinite digest
...
Avoid infinite digest loop from LocatorController associated
with upgrade to Angular 1.4.4
2015-09-09 17:15:35 -07:00
b1238b0c96
[Composition] Return newly-contextualized object
...
After adding to composition, return the newly-contextualized
object; this is regularly used by other services.
2015-09-02 11:37:47 -07:00
8759fdbd95
[Composition] Update specs
...
Update specs to reflect usage of the add method in
the composition capability.
2015-09-02 09:37:26 -07:00
8e995eba8f
[Composition] Use composition.add during creation
2015-09-01 17:11:09 -07:00
8a5c61e2e6
Merge remote-tracking branch 'upstream/master' into mobile
2015-09-01 14:50:45 -07:00
01f2fab70f
[Create] Filter out control-less properties
...
When properties have no control defined, don't show them
in the create dialog (but do show them in metadata, e.g.
info bubble.) For nasa/openmctweb#92
2015-09-01 11:48:15 -07:00
b39753d0a6
[Entanglement] Separate out location
...
Separate out location property from the CreationService,
instead handle in the entanglement bundle; this is
consistent with changes for identity management (attaching
a creator to newly-created domain object models).
for nasa/openmctweb#92
2015-09-01 10:57:56 -07:00
f0c64b6b92
[Browse] Back Arrow
...
Refactored Back Arrow to work same as prior
commit, however with less if else statements.
Returns if not at root, otherwise root is set to
true.
2015-08-27 10:45:48 -07:00
48136c2265
[Context] Back Arrow
...
Checks the Back Arrow in both checkRoot and
navigateToParent, also checks grandparent in both.
This allows the back arrow to hide in search when
context is unavailable.
2015-08-27 10:42:11 -07:00
a0169ad158
[Mobile] Browse Controller
...
Adjusted BrowseController to hide the
back button if current object represented/
selected has no context.
2015-08-26 20:20:16 -07:00
cd46dab5c1
[Mobile] Merge
...
Merged with master and resolved conflicts.
2015-08-25 12:36:50 -07:00
6a2bdd103b
[Mobile] Hide Tree
...
On selecting a node in the tree, if the
user is on phone and in portrait, than
emit up to the browse controller to call
treeSlide(), which will hide the tree menu.
Also adjusted the agent service to properly
check for orientation using window.innerHeight/
Width. Also created function for the selection
of an object in BrowseController.
2015-08-24 16:17:58 -07:00
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
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
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
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
c80e9bfa26
[Style] JSLint Compliance
2015-08-06 15:21:28 -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
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
97bf530b1d
[Mobile] BackArrow
...
Removed the BackArrow console log
that was getting called in the
BrowseController.
2015-07-29 11:41:10 -07:00
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
3c6c420023
[Mobile] Back Arrow
...
Back Arrow implemented
by getting parent and then
navigating to it.
2015-07-28 15:08:14 -07:00
2a4943f584
[Mobile] Console
...
Removed call to console so
mvn clean install would compile.
2015-07-28 10:58:22 -07:00
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
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
6e43a92191
[Mobile] Merge
...
Fix Conflicts.
2015-07-27 15:21:59 -07:00
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
54b6cd1100
[Mobile] Debug
...
Added debug statement to print
to console.
2015-07-15 13:28:42 -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
635e1eda69
[Mobile] Clean-Up
...
Removed unused menu button and
cleaned up treeCl to be treeClass.
2015-07-09 15:14:36 -07:00
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
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
b9371ea03d
[Mobile] Moved Button
...
Button moved to the Browse.html
and BrowseController handles the
tree slide.
2015-07-09 10:28:45 -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
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
