ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-23 06:52:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,062 Commits 989 Branches 212 Tags 191 MiB
264896c264
Commit Graph

34 Commits

Author SHA1 Message Date
Victor Woeltjen
264896c264 Merge branch 'master' into persist-on-mutation-825 
Conflicts:
	platform/commonUI/edit/src/actions/RemoveAction.js
	platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js
	platform/commonUI/edit/test/actions/RemoveActionSpec.js
	platform/entanglement/src/services/LinkService.js
	platform/features/timeline/src/controllers/drag/TimelineDragHandler.js
	platform/features/timeline/src/controllers/swimlane/TimelineSwimlaneDecorator.js
	platform/features/timeline/test/controllers/drag/TimelineDragHandlerSpec.js
	platform/features/timeline/test/controllers/swimlane/TimelineSwimlaneDropHandlerSpec.js
 2016-05-20 14:26:39 -07:00
Victor Woeltjen
9861e63589 [Code Style] Run fixstyle on merged changes 2016-05-20 13:09:16 -07:00
Victor Woeltjen
bce5643994 Merge branch 'master' into jscs-rebase-142 
Conflicts:
	platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js
	platform/representation/src/MCTRepresentation.js
 2016-05-20 13:07:58 -07:00
Victor Woeltjen
ad5691142e [Code Style] Rename shadowing variables 2016-05-20 13:05:32 -07:00
Victor Woeltjen
e3208187bf Merge branch 'master' into persist-on-mutation-825 
Conflicts:
	platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js
 2016-05-20 10:59:54 -07:00
Henry
601bc03ba2 [New Edit Mode] #636 Modified EditAndCompose action to rely on a slightly refactored EditActionPolicy to remove folder specific logic 2016-05-20 10:42:17 -07:00
Victor Woeltjen
8279acc9a5 [Persistence] Don't expect persist calls in PropertiesAction spec 2016-05-19 12:04:08 -07:00
Victor Woeltjen
63438ad9ba [Persistence] Don't expect persist calls in LinkAction spec 2016-05-19 12:02:42 -07:00
Victor Woeltjen
467f4d2257 [Persistence] Don't expect persist calls in RemoveAction spec 2016-05-19 12:00:51 -07:00
Victor Woeltjen
fa77139077 [Code Style] Run gulp fixstyle 
...to apply code style settings from #142.
 2016-05-19 11:29:13 -07:00
Henry
54a0de4a08 [New Edit Mode] #636 Removed edit concerns from DropGesture 2016-05-13 17:59:43 -07:00
Henry
44f4a82fa1 Resolved merge conflicts 2016-05-12 16:14:31 -07:00
Pete Richards
f3b265bdd5 Merge branch 'master' into open671 2016-05-09 10:19:24 -07:00
Henry
26e368f52d [Edit mode] Simplify SaveAction 2016-04-12 14:40:19 -07:00
Victor Woeltjen
d6ec7e9ab8 [Build] Remove unused variables from specs 
...to satisfy JSHint.
 2016-03-04 12:56:14 -08:00
Victor Woeltjen
ac5ac8d34e [Build] Remove boilerplate from scripts 
No longer necessary after JSHint configuration.
 2016-03-04 10:46:38 -08:00
Henry
6058e50216 JSLint fixes 2015-12-09 10:04:49 -08:00
Henry
4419a101d6 [New Edit Mode] #199 Disabled all failing tests 2015-12-08 15:15:54 -08: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
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
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
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
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
Victor Woeltjen
10863514cb [Licenses] Add license headers 
WTD-1051.
 2015-05-13 16:43:30 -07:00
Victor Woeltjen
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
Victor Woeltjen
aa9ceeb2be [Actions] Update specs 
Update specs for actions which change domain objects to
reflect their restriction to types that are creatable,
WTD-723.
 2015-01-27 13:28:19 -08:00
Victor Woeltjen
ba14aeabc6 [Forms] Complete specs 
Fill in new specs and amend existing specs to ensure
full coverage after integration of forms component,
and associated changes. WTD-593.
 2014-12-03 17:59:37 -08:00
Victor Woeltjen
6fb5da1b35 [Forms] Prune obsolete specs 
Prune obsolete specs after changes made to support
integration of forms component, WTD-593.
 2014-12-03 17:26:02 -08:00
Victor Woeltjen
5aff4e3777 [Forms] Edit Properties specs 
Add baseline specs (not yet matched up to current implementation)
for Edit Properties action. WTD-593.
 2014-12-03 17:07:01 -08:00
Victor Woeltjen
7ddfcbca9b [Common UI] Fill in spec for RemoveAction 
Fill in spec for the Remove action, included as part of
the bundle platform/commonUI/edit. WTD-574.
 2014-11-25 10:08:50 -08:00
Victor Woeltjen
19b4dc3fa3 [Common UI] Spec for EditAction 
Fill in spec for the Edit action, which enters Edit mode
Part of bundle platform/commonUI/edit, being transitioned
for WTD-574.
 2014-11-25 09:48:54 -08:00
Victor Woeltjen
2f7746df53 [Common UI] Add specs for Save/Cancel 
Add specs for the save and cancel conclude-editing
actions, part of bundle platform/commonUI/edit
(Edit Mode) which is transitioned among the various
common UI bundles. WTD-574
 2014-11-25 09:35:55 -08:00
Victor Woeltjen
88f3221938 [Common UI] Add skeleton specs for edit mode 
Add empty files which will contain specs for
bundle platform/commonUI/edit, which is responsible
for Edit mode. WTD-574.
 2014-11-24 17:07:17 -08:00