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
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
62898c921f
Merge branch 'open95' of https://github.com/nasa/openmctweb into open95
2015-09-03 10:37:10 -07:00
bb1a02c8bd
[Frontend] Significant re-factoring of CSS and markup
...
open #95
IN-PROGRESS!;
Mostly buttons and menus classes (s-btn and s-menu);
Removed unused templates and .css files;
Normalized some button containers;
2015-09-02 18:02:58 -07:00
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
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
b9d8b124ff
[Composition] Use composition.add from link action
2015-09-02 09:08:47 -07:00
7ffbc9ad2f
[Remove Action] Check
...
Added check for traverseObject
context because prior to this,
was not checked.
2015-08-31 13:37:22 -07:00
687d86790e
[Action] RemoveAction
...
Added comments regarding change in
checking of traversed objects.
2015-08-27 09:49:26 -07:00
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
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
e7563ff4e9
[Action] Merge
...
Merged with master.
2015-08-26 10:11:23 -07:00
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
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
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
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
aa08db1050
[Code Style] Avoid copying window/scope
...
Avoids Angular errors; WTD-1482.
2015-08-11 11:00:56 -07:00
be5cad212a
[Code Style] Use prototypes in Edit bundle
...
WTD-1482.
2015-08-10 16:38:13 -07:00
a7a1ac70e5
[JSDoc] Remove obsolete module references
...
WTD-1482.
2015-08-07 12:14:40 -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
e400f211c4
Merge remote-tracking branch 'nasa/open1404' into open1427
...
Merge in preparation for review/integration, WTD-1427
Conflicts:
platform/commonUI/general/res/templates/containers/accordion.html
2015-07-15 13:45:37 -07:00
9e6d84a1d5
[Edit] No more tooltips
...
Changed the attribute of 'title' on mct-container
to 'label'. This made the tooltips in Edit mode
dissapear. #46 .
2015-07-07 11:14:45 -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
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
3d0e0af7f2
[Windowing] Remove variable
...
Excess variable used for CancelAction's
ReturnToBrowse. WTD 23.
2015-06-25 14:28:38 -07:00
5ba0f9d7a1
Merge remote-tracking branch 'upstream/master' into open23
2015-06-25 14:08:46 -07:00
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
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
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
0b8d5ceb86
[Fronted] Significant refactoring of btn classes
...
WTD-839
Refactoring in advance of style mods to switcher when in frame;
Moved btn styles from _controls.scss to _buttons.scss;
Markup cleaned up with css classing simplified;
2015-06-10 17:23:08 -07:00
10863514cb
[Licenses] Add license headers
...
WTD-1051.
2015-05-13 16:43:30 -07:00
aec1176dc4
[Frontend] Hiding non-functional items; padding adjustments
...
WTD-1163
WTD-1146
New CSS to hide non-functional elements, including browse.top-bar with search elements;
Adjusted spacing, mainly in .contents CSS class;
2015-05-01 10:10:35 -07:00
3e972650c7
[Containment] Test LinkAction
...
Add test cases for LinkAction, added to allow composition
changes to be controlled by policy. WTD-962.
2015-04-10 17:37:11 -07:00
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
79f6e8c082
Merge branch 'open1062' into open-master
...
Merge changes for WTD-1062
2015-04-08 12:48:49 -07:00
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
5045795a7c
[Containment] Expose Link action as compose
...
Expose 'link' as 'compose'; this facilitates implementation of
drag-drop composition being deferred to actions which will
support move/copy/link options in the future. WTD-962.
2015-04-07 20:24:15 -07:00
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
874f81010c
[Edit] Update EditController spec
...
Update tests for EditController to match updated
usage of domain object API for WTD-1071.
2015-04-06 09:30:42 -07:00
8b6a972fa4
[Edit] Avoid double-wrapping
...
Avoid double-wrapping editable domain objects, WTD-1071.
2015-04-06 09:30:14 -07:00
60ed17e32b
[Edit] Add test case for double-wrapping
...
Add test case to detect double-wrapping of domain objects
retrieved via the editable domain object cache, identified
as the root cause of WTD-1071.
2015-04-06 09:28:53 -07:00
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
9be40d6d2a
[Edit] Fill in tests for Edit policies
...
Complete tests for policies for Edit actions, WTD-1062.
2015-04-01 16:21:06 -07:00
e2c6db8259
[Edit] Stub in specs for Edit policies
...
Stub in specs for policies added for Edit mode which control
the availability of the Edit and/or Edit Properties actions
in the view-control area, WTD-1062.
2015-04-01 16:08:15 -07:00
0ceb8d30cf
[Edit] Expose EditableViewPolicy
...
Expose EditableViewPolicy as an active extension in Edit mode,
WTD-1062.
2015-04-01 16:00:20 -07:00
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
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
e3ec9c6130
[Edit] Allow Edit Properties as a view-control action
...
Allow Edit Properties as an action of the view-control category,
WTD-1062.
2015-04-01 15:34:51 -07:00
