Commit Graph

264 Commits

Author SHA1 Message Date
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
9b273bc148 [Persistence] Don't expect persist calls in EditRepresenter spec 2016-05-19 11:52:58 -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
Henry
d08cdfba49 Fixed linting issues 2016-05-12 16:50:19 -07:00
Henry
ffacf6e1ae Resolved residual merge issue 2016-05-12 16:18:48 -07:00
Henry
69c4c3a2c8 Added tests 2016-05-12 16:14:42 -07:00
Henry
c305fba0a7 Modified dirty function 2016-05-12 16:14:42 -07:00
Henry
44f4a82fa1 Resolved merge conflicts 2016-05-12 16:14:31 -07:00
Henry
5bf750c90c Fixed creation 2016-05-12 16:11:57 -07:00
Henry
836b5db8cf Reviewed edit mode checking 2016-05-12 16:11:57 -07:00
Henry
1753a5473c Resolved merge conflicts 2016-05-12 16:11:52 -07:00
Henry
d00e13e4ee Resolved merge conflicts 2016-05-12 16:09:53 -07:00
Henry
433dd87e51 Resolved merge conflicts 2016-05-12 16:07:39 -07:00
Henry
cf9eb3f602 Resolved Merge conflicts, removed previously deleted files 2016-05-12 16:05:27 -07:00
Henry
bd686790dc Resolved merge conflicts 2016-05-12 16:03:19 -07:00
Henry
e5ef7c0c22 Resovled merge conflicts 2016-05-12 15:58:17 -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
Victor Woeltjen
8756b7213f [Persistence] Remove persistence usage from EditRepresenter 2016-04-29 11:35:00 -07:00
Victor Woeltjen
433d26e703 [Persistence] Remove persistence usage from Remove action 2016-04-26 16:53:12 -07:00
Victor Woeltjen
c99ffcb1f4 [Persistence] Remove persistence call from compose action 2016-04-26 16:50:15 -07:00
Victor Woeltjen
7fb7a5452f [Persistence] Remove persistence usage from Edit Properties 2016-04-26 16:43:52 -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
8c3616da32 Addressed code review points 2016-04-14 16:04:15 -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
2fe7ba982f Added 'Open in New Tab' to context menu in edit mode 2016-04-11 17:06:37 -07:00
Henry
7f108c3b24 [Edit Mode] #635 Removed Edit-related concerns from ContextMenuGesture 2016-04-11 15:39:35 -07:00
Victor Woeltjen
934eb13813 [Build] Remove obsolete jslint tags
ES5 mode is enabled by default in JSHint, tags no longer necessary per
https://github.com/nasa/openmct/pull/724#discussion_r55095722
2016-04-08 16:54:01 -07:00
Victor Woeltjen
5088453712 [Build] Remove use strict, global
Remove usages of use strict and global declarations that are
no longer necessary with JSHint configuration, from files
added/changed since #724
2016-04-08 16:11:12 -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
Victor Woeltjen
8f4f0cb78e Merge pull request #785 from nasa/open677_cleanup
[Timelines] #677 Removed temporary markup
2016-04-05 12:24:58 -07:00
Henry
650ef9bfa4 [Timelines] #677 Removed temporary markup 2016-03-23 11:27:40 -07:00
Victor Woeltjen
31d8c9a48f [Timeline] Allow linking during edit
...in cases where it is safe to do so (specifically, when the
linked-to object has already been persisted.)
2016-03-22 12:04:50 -07:00
Victor Woeltjen
007741b4e7 [Timeline] Add move policy
...to restore suppression of Move for objects being edited
(relaxed for the specific case of moving one object being
edited into another object being edited, for use in Timelines.)
2016-03-21 12:07:19 -07:00
Charles Hacskaylo
a4c5854561 [Frontend] Bug fixing
open #729
open #498
Fixed markup to use proper CSS classes
to allow tree items in Inspector Elements to
ellipsize properly, and to apply scroll regions
to the proper elements;
2016-03-10 14:33:01 -08:00
Victor Woeltjen
134452582c [Build] Remove/qualify for-in usages 2016-03-04 13:10:23 -08:00
Victor Woeltjen
d6ec7e9ab8 [Build] Remove unused variables from specs
...to satisfy JSHint.
2016-03-04 12:56:14 -08:00
Victor Woeltjen
a1a7b2b8ce [Build] Remove unused variables
...to satisfy JSHint
2016-03-04 11:41:48 -08:00
Victor Woeltjen
c00d77dcb1 [Build] Relocate operators
...in multi-line expressions, to satisfy JSHint.
2016-03-04 11:02:57 -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
670c06103f [Edit Mode] Rebased over master 2016-03-02 11:45:15 -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