ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-22 14:32:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,025 Commits 989 Branches 212 Tags 191 MiB
bce5643994
Commit Graph

89 Commits

Author SHA1 Message Date
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
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
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
d08cdfba49 Fixed linting issues 2016-05-12 16:50:19 -07:00
Henry
69c4c3a2c8 Added tests 2016-05-12 16:14:42 -07:00
Henry
44f4a82fa1 Resolved merge conflicts 2016-05-12 16:14:31 -07:00
Henry
cf9eb3f602 Resolved Merge conflicts, removed previously deleted files 2016-05-12 16:05:27 -07:00
Pete Richards
3ca9d21bbd Merge remote-tracking branch 'origin/open663' 2016-05-09 10:33:39 -07:00
Pete Richards
61683800cc [Style] Update style to reflect new jshint config 
Update style to match new jshint config

https://github.com/nasa/openmct/issues/671
 2016-05-09 10:33:26 -07:00
Pete Richards
f3b265bdd5 Merge branch 'master' into open671 2016-05-09 10:19:24 -07:00
Henry
11cfb6e1b8 [Edit] Elements pool filtering displays more consistent results 2016-04-21 10:42:50 -07:00
Henry
06436c488a [Edit Mode] #794 Modified policy to show remove action in context for non-editable domain object types 2016-04-18 19:05:46 -07:00
Andrew Henry
6cb9619fbe Merge pull request #829 from nasa/open630 
[Edit mode] Simplify SaveAction
 2016-04-14 16:11:49 -07:00
Henry
26e368f52d [Edit mode] Simplify SaveAction 2016-04-12 14:40:19 -07:00
Henry
519a9333ab Updated tests 2016-04-11 17:10:35 -07:00
Henry
7f108c3b24 [Edit Mode] #635 Removed Edit-related concerns from ContextMenuGesture 2016-04-11 15:39:35 -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
7b5218c5ba [Edit Mode] #627 Fixed failing tests 
Removed reference to defunct NavigationServiceDecorator

Removed virtual panels from drop gesture
 2016-03-02 11:12:41 -08:00
Henry
f192544be3 Addressing issues from code review 2016-03-02 11:10:49 -08:00
Henry
2cc2c6a9d3 [Edit Mode] #627 removed edit concerns from browse controllers and markup 
Fixed elements not appearing in edit mode

Fixed failing tests
 2016-03-02 11:05:23 -08:00
Melanie Lean
53c60ee64f [Timelines] #677 Applied fix to prevent editing of timelines in browse mode 
Fixed failing test
 2016-02-11 21:52:05 -08:00
Victor Woeltjen
b0e4947bf0 Merge pull request #500 from nasa/open480 
[New Edit Mode] Adding sub objects to Timelines
 2016-02-08 11:59:54 -08:00
Victor Woeltjen
aebae27391 [Tests] Remove suite.json files 
Remove obsolete suite.json files; #482
 2016-02-02 09:35:50 -08:00
Henry
c65096f166 [New Edit Mode] Added AddAction, modified EditableDomainObject to properly wrap inherited functions, added new EditableInstantiationCapability 2016-01-20 18:49:39 -08:00
Henry
b4448020e4 JSLint 2016-01-14 15:12:15 -08:00
Henry
0741e2cf5e Disabled failing tests 2016-01-14 15:11:19 -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
d5f054e328 [Edit] Test return type 
...from the edit-mode-wrapped persistence capability.
 2015-12-04 11:20:19 -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
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
be5cad212a [Code Style] Use prototypes in Edit bundle 
WTD-1482.
 2015-08-10 16:38:13 -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
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
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
79f6e8c082 Merge branch 'open1062' into open-master 
Merge changes for WTD-1062
 2015-04-08 12:48:49 -07:00
Victor Woeltjen
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
Victor Woeltjen
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
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
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
Victor Woeltjen
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