ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-07 13:48:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,299 Commits 991 Branches 212 Tags 192 MiB
766e94ed62
Commit Graph

46 Commits

Author SHA1 Message Date
Victor Woeltjen
766e94ed62 Merge remote-tracking branch 'origin/master' into persist-on-mutation-825b 
Conflicts:
	platform/core/src/capabilities/PersistenceCapability.js
 2016-07-25 16:30:49 -07:00
Henry
c8898ac6aa [Documentation] Updated copyright statement. Fixes #1081 2016-07-12 16:55:57 -07:00
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
Henry
b6502e9ea1 [New Edit Mode] #633 Removed Editing workflow concerns from FixedController, LayoutController 2016-05-20 14:12:24 -07:00
Victor Woeltjen
ad5691142e [Code Style] Rename shadowing variables 2016-05-20 13:05:32 -07:00
Victor Woeltjen
d3f2a24267 Merge branch 'master' into persist-on-mutation-825 
Conflicts:
	platform/core/src/capabilities/PersistenceCapability.js
	platform/features/timeline/src/controllers/swimlane/TimelineSwimlaneDropHandler.js
 2016-05-19 11:41:08 -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
44f4a82fa1 Resolved merge conflicts 2016-05-12 16:14:31 -07:00
Victor Woeltjen
8756b7213f [Persistence] Remove persistence usage from EditRepresenter 2016-04-29 11:35:00 -07:00
Victor Woeltjen
5e44bfc6c7 Merge branch 'master' into open671 
Conflicts:
	main.js
	platform/commonUI/edit/src/policies/EditableMovePolicy.js
	platform/commonUI/general/src/directives/MCTTree.js
	platform/commonUI/general/src/ui/ToggleView.js
	platform/core/src/actions/ActionCapability.js
	platform/core/test/models/CachingModelDecoratorSpec.js
	platform/core/test/services/InstantiateSpec.js
	platform/features/events/bundle.js
	platform/features/events/src/DomainColumn.js
	platform/features/events/src/EventListController.js
	platform/features/events/src/EventListPopulator.js
	platform/features/events/src/RangeColumn.js
	platform/features/events/src/directives/MCTDataTable.js
	platform/features/events/src/policies/MessagesViewPolicy.js
	platform/features/events/test/DomainColumnSpec.js
	platform/features/events/test/EventListControllerSpec.js
	platform/features/events/test/EventListPopulatorSpec.js
	platform/features/events/test/RangeColumnSpec.js
	platform/features/events/test/policies/MessagesViewPolicySpec.js
	platform/features/rtevents/bundle.js
	platform/features/rtevents/src/DomainColumn.js
	platform/features/rtevents/src/RTEventListController.js
	platform/features/rtevents/src/RangeColumn.js
	platform/features/rtevents/src/directives/MCTRTDataTable.js
	platform/features/rtevents/src/policies/RTMessagesViewPolicy.js
	platform/features/rtevents/test/DomainColumnSpec.js
	platform/features/rtevents/test/RTEventListControllerSpec.js
	platform/features/rtevents/test/RangeColumnSpec.js
	platform/features/rtevents/test/policies/RTMessagesViewPolicySpec.js
	platform/features/rtscrolling/bundle.js
	platform/features/rtscrolling/src/DomainColumn.js
	platform/features/rtscrolling/src/NameColumn.js
	platform/features/rtscrolling/src/RTScrollingListController.js
	platform/features/rtscrolling/src/RangeColumn.js
	platform/features/scrolling/src/DomainColumn.js
	platform/features/scrolling/src/RangeColumn.js
	platform/features/scrolling/src/ScrollingListController.js
	platform/features/scrolling/src/ScrollingListPopulator.js
	platform/features/scrolling/test/DomainColumnSpec.js
	platform/features/scrolling/test/RangeColumnSpec.js
	platform/features/scrolling/test/ScrollingListControllerSpec.js
	platform/features/scrolling/test/ScrollingListPopulatorSpec.js
	platform/features/table/src/directives/MCTTable.js
	platform/features/table/test/controllers/TelemetryTableControllerSpec.js
	platform/representation/src/gestures/DropGesture.js
	platform/telemetry/src/TelemetryFormatter.js
	test-main.js
 2016-04-08 16:08:19 -07:00
Henry
650ef9bfa4 [Timelines] #677 Removed temporary markup 2016-03-23 11:27:40 -07:00
Victor Woeltjen
a1a7b2b8ce [Build] Remove unused variables 
...to satisfy JSHint
 2016-03-04 11:41:48 -08:00
Victor Woeltjen
56a91dfbaf [Build] Use not-threequals operator 
...to satisfy JSHint
 2016-03-04 10:58:23 -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
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
Henry
fa46d31ac2 [Edit Mode] #627 slightly modified edit representer to detect newly created objects 
Added some comments, renamed controller variable in markup

Removed edit references from BrowseController
 2016-03-02 10:57:05 -08:00
Henry
549dfab5aa [Edit Mode] #627 remove edit concerns from browse controller 2016-03-02 10:55:18 -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
Henry
f300b99b7b [New Edit Mode] Code style fixes 
JSLint error
 2016-01-14 15:55:02 -08:00
Henry
49579378dd [New Edit Mode] Fixed positioning of dropped objects #386 2015-12-09 09:51:00 -08:00
Henry
c211f413aa [New Edit Mode] Add Elements pool to New Edit Mode #279 2015-11-25 10:40:37 -08: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
c08a460d30 [JSDoc] Add annotations 
Bulk-add JSDoc annotations, WTD-1482.
 2015-08-07 11:44:54 -07:00
Victor Woeltjen
10863514cb [Licenses] Add license headers 
WTD-1051.
 2015-05-13 16:43:30 -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
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
Victor Woeltjen
0d5a849a41 [Edit] Restructure source folder 
Restructure sources associated with Edit mode; work on
WTD-788 has increased number of sources here so more
organization is useful.
 2015-02-26 17:06:30 -08:00
Victor Woeltjen
1e76264d82 [Edit] Avoid extra commits 
Avoid issuing extra commit calls from the Edit toolbar;
this can cause disruption of state from other views (such
as Fixed Position), WTD-881.
 2015-02-24 09:47:00 -08:00
Victor Woeltjen
59ff539bfb [Fixed Position] Update specs for coverage 
Update specs to restore code coverage after changes for WTD-881.
 2015-02-24 09:18:00 -08:00
Victor Woeltjen
8452b2ab12 [Fixed Position] Update specs 
Update failing specs after changes for WTD-881.
 2015-02-24 09:07:57 -08:00
Victor Woeltjen
307fbe2151 [Edit] Update EditToolbar spec 
Update EditToolbar spec to reflect changes for WTD-881.
 2015-02-23 19:47:56 -08:00
Victor Woeltjen
6c7dfb878b [Edit] Avoid rebuilding toolbar on edit 
Avoid rebuilding the toolbar in Edit mode whenever
any change occurs to avoid losing the binding to the
current selection state; needed for color picker to
work properly for WTD-881.
 2015-02-23 15:57:45 -08:00
Victor Woeltjen
f894233182 [Edit] Default to inclusive mode 
Default to inclusive mode in Edit mode toolbar;
simplifies adding additional toolbar elements for
Fixed Position view, WTD-881.
 2015-02-23 15:13:46 -08:00
Victor Woeltjen
c183f08886 [Edit] Fix state-watching 
Repair/simplify state-watching in representer for toolbar
in edit mode; avoids issue where destroy calls detach
watches for state change in toolbar prematurely. WTD-881.
 2015-02-23 14:51:17 -08:00
Victor Woeltjen
8c653d39d7 [Edit] Update specs 
Update specs for toolbars in Edit mode to reflect
changes for WTD-879.
 2015-02-19 12:44:00 -08:00
Victor Woeltjen
5680710c06 [Fixed Position] Implement remove 
Implement remove button for selected elements in fixed
position view. WTD-879.
 2015-02-18 20:12:55 -08:00
Victor Woeltjen
db2f2eb098 [Fixed Position] Improve button support 
Improve button support from toolbars by adding a click
function when generating structures for mct-toolbar based
on view definitions. WTD-879.
 2015-02-17 16:29:15 -08:00
Victor Woeltjen
3916968544 [Edit] Add EditToolbarRepresenter spec 
Add tests for representer which mediates between view's
selection and toolbar contents, WTD-878.
 2015-02-17 15:47:18 -08:00
Victor Woeltjen
023c12ec3b [Edit] Add toolbar representer 
Add a representer to handle exposing toolbars for views in
edit mode. WTD-878.
 2015-02-17 14:31:02 -08:00
Victor Woeltjen
5dc72b15c2 [Edit] Implement EditToolbar 
Implement EditToolbar (sufficient to satisfy spec) which will
construct an mct-toolbar-friendly form structure based on both
the current selection and the view's defined toolbar structure.
WTD-878.
 2015-02-17 13:47:14 -08:00
Victor Woeltjen
8f14f4e5eb [Edit] Add spec for toolbar 
Add spec for class that will convert toolbar definition
provided by views to suitable input for mct-toolbar, WTD-878.
 2015-02-17 12:58:36 -08:00