Commit Graph

87 Commits

Author SHA1 Message Date
Pete Richards
70bc17c79f Merge remote-tracking branch 'github-open/open97' into open-master 2015-09-23 13:44:48 -07:00
Victor Woeltjen
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
Victor Woeltjen
c6df7cebe5 [Angular] Check for context capability
Check for existence of context capability from Remove action
during navigation check. This avoids an exception that
appears to have been swallowed in earlier versions of
Angular.
2015-09-09 17:25:02 -07:00
Victor Woeltjen
3310016264 [Properties] Hide rows without controls
Hide rows for domain object properties that do not have
associated controls from the Edit Properties dialog;
follow up for nasa/openmctweb#92
2015-09-02 12:01:43 -07:00
Victor Woeltjen
b9d8b124ff [Composition] Use composition.add from link action 2015-09-02 09:08:47 -07:00
Shivam Dave
7ffbc9ad2f [Remove Action] Check
Added check for traverseObject
context because prior to this,
was not checked.
2015-08-31 13:37:22 -07:00
Shivam Dave
687d86790e [Action] RemoveAction
Added comments regarding change in
checking of traversed objects.
2015-08-27 09:49:26 -07:00
Shivam Dave
3ec4cc099b [Action] RemoveAction
Adjusted unit tests for checking if
traverseObject is undefined. Also removed
unnecessary ROOT_ID variable.
2015-08-27 09:41:00 -07:00
Shivam Dave
dadbf3f6dc [Action] RemoveAction
Checks if the object exists, instead of
checking if the ROOT is specifically reached,
when traversing up to ancestors.
2015-08-27 09:17:11 -07:00
Shivam Dave
e7563ff4e9 [Action] Merge
Merged with master.
2015-08-26 10:11:23 -07:00
Shivam Dave
a507557cec [Remove] Remove Action
Tweaked remove action to return
on finding the object that is being removed and
checking if it can be navigated to. Also completed
tests for RemoveAction.
2015-08-26 10:07:51 -07:00
Shivam Dave
d0183d44c9 [Actions] Remove Action
When an ascendant or parent or currently
selected object is removed the user is navigated
to the parent of the object being removed. Added variables
to RemoveAction test to test removing currently selected
domainObject.
2015-08-21 13:04:47 -07:00
Victor Woeltjen
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
Victor Woeltjen
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
Victor Woeltjen
aa08db1050 [Code Style] Avoid copying window/scope
Avoids Angular errors; WTD-1482.
2015-08-11 11:00:56 -07:00
Victor Woeltjen
be5cad212a [Code Style] Use prototypes in Edit bundle
WTD-1482.
2015-08-10 16:38:13 -07:00
Victor Woeltjen
a7a1ac70e5 [JSDoc] Remove obsolete module references
WTD-1482.
2015-08-07 12:14:40 -07:00
Victor Woeltjen
31eb366e7f [JSDoc] Add namespace docs
WTD-1482.
2015-08-07 12:13:15 -07:00
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
Shivam Dave
3d0e0af7f2 [Windowing] Remove variable
Excess variable used for CancelAction's
ReturnToBrowse. WTD 23.
2015-06-25 14:28:38 -07:00
Shivam Dave
5ba0f9d7a1 Merge remote-tracking branch 'upstream/master' into open23 2015-06-25 14:08:46 -07:00
Shivam Dave
3a371483ab [Windowing] urlService
Added the urlService to the unit
tests for the cancel and save buttons
also removed unused services. WTD 23.
2015-06-25 14:07:02 -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
Victor Woeltjen
0ae1ba4a40 [Edit] Don't wrap non-editable objects
In Edit mode, don't bother wrapping domain objects which should
not be edited even in principle. Avoids insulating these objects
from updates which occur asynchronously, which in turn avoids
WTD-1291.
2015-06-17 10:23:16 -07:00
Victor Woeltjen
10863514cb [Licenses] Add license headers
WTD-1051.
2015-05-13 16:43:30 -07:00
Victor Woeltjen
f6df73c11b Merge branch 'open-master' into open962
Merge in latest from open-master into topic branch
for WTD-962
2015-04-10 17:30:03 -07:00
Victor Woeltjen
79f6e8c082 Merge branch 'open1062' into open-master
Merge changes for WTD-1062
2015-04-08 12:48:49 -07:00
Victor Woeltjen
44eb54884b [Containment] Fire a link action on drop
Fire a link action as the result of a drag-drop operation,
WTD-962.
2015-04-07 20:35:54 -07:00
Victor Woeltjen
5adcd3cd6d [Containment] Implement Link
Implement link as a basic action, to separate it out from
drop gesture such that it can be controlled by policy. For
WTD-962.
2015-04-07 20:20:56 -07:00
Victor Woeltjen
8b6a972fa4 [Edit] Avoid double-wrapping
Avoid double-wrapping editable domain objects, WTD-1071.
2015-04-06 09:30:14 -07:00
Victor Woeltjen
3c3dd0ad17 Merge branch 'open1035' into open-master
Merge WTD-1035; resolving conflicts to avoid WTD-1069

Conflicts:
	platform/commonUI/edit/src/controllers/EditController.js
	platform/commonUI/edit/src/objects/EditableDomainObjectCache.js
2015-04-06 08:32:54 -07:00
Victor Woeltjen
facf350648 [Edit] Add policy to restrict views in Edit mode
Add policy to disallow views in Edit mode which have been
explicitly flagged as non-editable, WTD-1062.
2015-04-01 15:50:15 -07:00
Victor Woeltjen
ccf2ccc4c6 [Edit] Add policy for the Edit action
Allow Edit mode only when editable views exist, WTD-1062.
2015-04-01 15:45:43 -07:00
Victor Woeltjen
dc7d504691 [Edit] Check for route changes
Respond to route changes via mct-before-unload, in order to
show a prompt to allow the user to confirm navigation changes
which do not trigger onbeforeunload (such as using back to
change the hash route). WTD-1035.
2015-03-31 14:46:11 -07:00
Victor Woeltjen
5ef382d159 [Edit] Add clarifying comments
Add clarifying comments related to checking of conditions
on unload, WTD-1035.
2015-03-31 14:39:30 -07:00
Victor Woeltjen
8a8c84eacf Merge branch 'open-master' into open1035
Merge in latest changes into topic branch for WTD-1035,
dialog warning before navigating out of Edit mode.
2015-03-31 14:32:55 -07:00
Victor Woeltjen
0090732f71 [Persistence] Handle refresh after edit
Correctly handle Discard changes after leaving Edit mode when
conflicts are detected; WTD-1033.
2015-03-24 15:53:27 -07:00
Victor Woeltjen
821cc65d6f [Edit] Remove unused code
Remove unused and/or excessive code related to Save in Edit mode.
WTD-1033.
2015-03-24 10:41:56 -07:00
Victor Woeltjen
8f288751db [Edit] Persist in a group
Invoke persist calls when leaving Edit mode in a group, instead of
in-order, to allow these revision-checking to be handling for the
group as a whole. WTD-1033.
2015-03-24 10:01:45 -07:00
Victor Woeltjen
bb4ea2d4ae [Edit] Get to true root from EditPanesController
Part of refactoring to hide objects outside of Edit mode from
the Create menus in Edit mode, WTD-922.
2015-03-18 09:56:15 -07:00
Victor Woeltjen
6e783648d6 [Edit] Hide root object
Act as if the object being edited is the root object when
in Edit mode, except in the Library pane (which has its own
means of getting the real root object.) WTD-922.
2015-03-17 18:11:46 -07:00
Victor Woeltjen
783d2f332b [Edit] Add mct-before-unload directive
Add directive for exposing expressions which should be
evaluated for the browser's onbeforeunload event, to
prevent user-initiated navigation from causing a loss
of unsaved changes. WTD-1035.
2015-03-16 17:28:10 -07:00
bwyu
8673e2045e Merge remote-tracking branch 'origin/open987' into open-master 2015-03-16 10:28:55 -07:00
bwyu
c2d7996785 Merge remote-tracking branch 'origin/open929' into open-master 2015-03-13 16:21:08 -07:00
bwyu
6575291e3e Merge remote-tracking branch 'origin/open788' into open-master 2015-03-10 12:41:08 -07:00
Victor Woeltjen
bbe26cd06c [Core] Edit-wrap relationship capability
Wrap objects retrieved via the relationship capability
with Edit mode caching etc, for WTD-1007.
2015-03-09 15:29:25 -07:00
Victor Woeltjen
d7e962e4b1 [Edit] Update tests
Update tests for Edit mode bundle to include the
general-purpose selection API, WTD-929.
2015-03-03 18:43:26 -08:00
Victor Woeltjen
bc69f19012 [Edit] Utilize EditToolbarSelection
Utilize newer, more general-purpose selector from the
representer responsible for binding selection scope to
toolbar. WTD-929.
2015-03-03 18:34:03 -08:00
Victor Woeltjen
6c97815efb [Edit] Add Selection class
Add class to handle selection, which will be synchronized
to the toolbar. WTD-929.
2015-03-03 18:31:34 -08:00