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

132 Commits

Author SHA1 Message Date
Victor Woeltjen
362248a02e [Timeline] Run gulp fixstyle 2016-05-24 12:37:10 -07:00
Victor Woeltjen
16d20eabd2 [Timeline] Simplify method 2016-05-24 12:33:47 -07:00
Victor Woeltjen
eb5566f041 [Timeline] Add tests for timeline zoom changes 2016-05-24 12:33:19 -07:00
Victor Woeltjen
757da1dff4 [Timeline] Remove obsolete test cases 2016-05-24 11:54:49 -07:00
Victor Woeltjen
85432af187 [Timeline] Don't store zoom configuration 
https://github.com/nasa/openmct/issues/936#issuecomment-221343620
 2016-05-24 11:53:27 -07:00
Victor Woeltjen
9a5209f7c2 [Timeline] Add zoom-to-fit button 2016-05-23 16:06:10 -07:00
Victor Woeltjen
0818a7cda0 [Timeline] Increase maximum zoom level 
#936
 2016-05-23 15:36:26 -07:00
Victor Woeltjen
f35947361c [Timeline] Remain centered during zoom 
#936
 2016-05-23 15:32:48 -07:00
Andrew Henry
25a2321578 Merge pull request #927 from nasa/jscs-rebase-142 
[Code Style] Enforce code style
 2016-05-20 14:03:27 -07:00
Victor Woeltjen
ad5691142e [Code Style] Rename shadowing variables 2016-05-20 13:05:32 -07:00
Victor Woeltjen
b5229d7786 [Timeline] Commit changes on toggle 
#908
 2016-05-19 15:06:06 -07:00
Victor Woeltjen
f9631ff4c5 [Code Style] Fix style missed by gulp fixstyle 
...and remove an unnecessary comment, too.
 2016-05-19 11:29:41 -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
Henry
836b5db8cf Reviewed edit mode checking 2016-05-12 16:11:57 -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
Charles Hacskaylo
a58fe1f81c [Frontend] Modified .tick-labels in Timelines 
open #909
- Changed markup to not use plot .tick-label class;
- Changed CSS accordingly;
- Fixed alignment (clipped bottom value) by
refactoring to use flex-box layout for tick labels;
 2016-05-10 20:41:52 -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
Pete Richards
c591ade479 Merge remote-tracking branch 'origin/781' 2016-04-06 10:35:40 -07:00
Pete Richards
5b98da6681 Merge pull request #807 from nasa/timeline-model-717 
[Timeline] Add default values to model
 2016-04-01 10:10:15 -07:00
Victor Woeltjen
06c6832676 [Timeline] Add default values to model 
Add default values to model, such that editing which occurs
before user supplies these properties does not cause errors
to occur. Directly addresses #717, indirectly addresses
remaining errant behavior associated with #790.
 2016-03-31 15:46:56 -07:00
Victor Woeltjen
4441e88769 Merge pull request #803 from nasa/drag-drop-688 
[Firefox] Invoke preventDefault on drop
 2016-03-31 11:02:26 -07:00
Victor Woeltjen
254a944d7a [Firefox] Invoke preventDefault on drop 
...such that Firefox does not try to treat drop as a new URL
to navigate to. Addresses #688 and #527
 2016-03-31 10:34:24 -07:00
Victor Woeltjen
530b940a64 [Timeline] Fix reordering 
Fix reordering behavior when dragging-and-dropping within timelines;
addresses #789.
 2016-03-29 19:46:30 -07:00
Pete Richards
cbea842c8b Merge branch 'timeline-highlight-767' 2016-03-24 13:33:56 -07:00
Pete Richards
cc5d14deec Merge branch '755a' 2016-03-24 13:21:59 -07:00
Pete Richards
4c5217d646 [Style] Standardize indentation 2016-03-24 13:20:49 -07:00
Pete Richards
5e54b193ca [Style] remove unnecessary parenthesis 
See comment https://github.com/nasa/openmct/pull/782/files#r57380540
 2016-03-24 13:14:53 -07:00
Charles Hacskaylo
88784d37fd [Frontend] Added priority 
#787
 2016-03-24 12:05:10 -07:00
Andrew Henry
700e605bbd Merge pull request #775 from nasa/timeline-drag-drop-679 
[Timeline] Move (instead of link) when dragging and dropping within a timeline
 2016-03-23 20:00:48 -07:00
Charles Hacskaylo
7da1a4b2a3 [Frontend] Updated glyph defs and descriptions 
#781
#187
Converted many glyph char defs to
their JSON unicode equivalents;
Updated descriptions for many domain
objects;
 2016-03-23 19:04:32 -07:00
Victor Woeltjen
c13231b8e8 [Timeline] Remove NULL_ACTION, clarify logic 
Per code review feedback,
https://github.com/nasa/openmct/pull/775/files#r57229759
 2016-03-23 15:34:05 -07:00
Victor Woeltjen
dd053f7e6e [Timeline] Invoke $apply from mct-swimlane-drop 
...and add some checks to ensure this is necessary, to avoid
triggering a ton of digest cycles while dragging.
 2016-03-22 17:16:41 -07:00
Victor Woeltjen
cb655d486b [Timeline] Test reordering within parent 2016-03-22 17:06:58 -07:00
Victor Woeltjen
3c52ceb71a [Timeline] Remove unused function 
Removal of domain objects is handled by using the move action.
 2016-03-22 17:01:45 -07:00
Victor Woeltjen
b2337dea97 [Timeline] Update failing specs 
...and remove obsolete test case for handling drops in a timeline
 2016-03-22 16:59:09 -07:00
Victor Woeltjen
dea6554e04 [Timeline] Allow drops from tree 
Don't assume that all drops will be dropped swimlanes.
 2016-03-22 12:26:01 -07:00
Henry
e5544615cc [Timelines] #715 Added a check to prevent mutation when modes are unchanged 2016-03-21 17:01:38 -07:00
Victor Woeltjen
e0a69744e5 [Timeline] Deinline null action 
...used for cases when no action is needed for timeline move
(and ids will just be reordered.)
 2016-03-21 11:53:10 -07:00
Victor Woeltjen
e7a6c34bcc [Timeline] Handle drops for reordering 
...as these would be disallowed by Move, normally.
 2016-03-21 11:51:51 -07:00
Victor Woeltjen
7f3ac4077c [Timeline] Drop to correct targets 2016-03-21 11:43:02 -07:00
Victor Woeltjen
5034e88656 [Timeline] Use move action on drag-drop 
...to avoid creating links when desired behavior is a move,
#679.
 2016-03-21 11:18:18 -07:00
Charles Hacskaylo
aa48044345 [Frontend] Form styling 
#772
Added ".l-controls-under" styling to allow
channel-selector layout;
Added new hint color constants and refined
style defs;
 2016-03-21 11:13:43 -07:00
Charles Hacskaylo
90c82f6ef2 [Frontend] Timeline tooltip and field input tweaks 
#750
Refined tooltip for Resource Graphing;
Increased size of Activity Link input field;
 2016-03-21 10:08:59 -07:00
Charles Hacskaylo
5e6fe16b93 [Frontend] Adding tooltips 
#750
 2016-03-17 16:21:04 -07:00
Charles Hacskaylo
f0ca6fdfdb [Frontend] Added tooltips 
#750
Added tooltips to Timeline header elements;
 2016-03-17 15:10:42 -07:00
Charles Hacskaylo
471b57f47c [Frontend] CSS tweaks 
#750
Moved l-plot-resource cursor: pointer
to a more specific selector;
Added user-select: none to l-header;
Fixed s-status-editing styling so
that tabular labels only appear draggable
while editing;
 2016-03-16 18:19:44 -07:00