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

3619 Commits

Author SHA1 Message Date
Charles Hacskaylo
8c5538ec4d [Frontend] Styling for Time Conductor v2 
Fixes #933
"Sticky" clock anim for LAD mode
 2016-07-14 14:58:18 -07:00
Victor Woeltjen
a731c35ad6 [Persistence] Refactor out transaction management 2016-07-14 13:43:55 -07:00
Victor Woeltjen
c7529dd56b [Persistence] Share transaction clearing functions 2016-07-14 12:53:58 -07:00
Victor Woeltjen
00fff52529 [Persistence] Track persist-pending state globally 2016-07-14 12:50:36 -07:00
Victor Woeltjen
4c7ad6d93a Merge branch 'undirty-on-refresh-1046' into transaction-clearing-1059 
Conflicts:
	platform/commonUI/edit/src/actions/SaveAsAction.js
 2016-07-14 11:53:39 -07:00
Victor Woeltjen
eb5493e37b [Persistence] Revert quick-fix for persistence clearing 
Revert "Squashed commit of the following:"

This reverts commit d1c01d3c86.
 2016-07-14 11:51:59 -07:00
Victor Woeltjen
1fb18c7919 [Context] Add test, tweak logic 
Add test to verify that warnings are not shown based on
composition/location inconsistencies when editing.
 2016-07-14 11:16:07 -07:00
Victor Woeltjen
1c2378b3b4 [Context] Suppress warnings while editing 
Don't expect consistency between composition and location fields
while an object is being edited; this avoids benign warnings
being logged. Fixes #624
 2016-07-14 11:10:15 -07:00
Henry
2f9fbfef7f More refactoring 2016-07-13 20:33:47 -07:00
Henry
2baca659ca Refactoring 2016-07-13 19:50:58 -07:00
Charles Hacskaylo
8b694ef337 [Frontend] Styling for Time Conductor v2 
Fixes #933
In-progress: color/size tweaks, fixes for espresso
theme
 2016-07-13 19:42:51 -07:00
Charles Hacskaylo
e193e3dfba Merge open933 latest, resolve conflicts 
Fixes #933
Fair amount of manual fixing in time-conductor.html
 2016-07-13 19:16:27 -07:00
Charles Hacskaylo
8214c8e895 Merge open933 latest, resolve conflicts 
Fixes #933
Fair amount of manual fixing in time-conductor.html
 2016-07-13 19:16:00 -07:00
Charles Hacskaylo
33b2225d10 [Frontend] Styling for Time Conductor v2 
Fixes #933
In-progress: restructured markup to move
modeModel farther out; animated icon
 2016-07-13 18:48:17 -07:00
Henry
14463d39a8 Added end delta 2016-07-13 18:17:27 -07:00
Charles Hacskaylo
fcfda50e73 [Frontend] Styling for Time Conductor v2 
Fixes #933
In-progress: color tweaks, bar sizing,
field widths
 2016-07-13 15:00:16 -07:00
Charles Hacskaylo
06af84c161 [Frontend] Styling for Time Conductor v2 
Fixes #933
In-progress: fixed SVG text color, field
styling for fixed vs. real-time, markup cleanup
 2016-07-13 13:14:32 -07:00
Charles Hacskaylo
5238aa2731 [Frontend] Styling for Time Conductor v2 
Fixes #933
In-progress; fixed SVG text color
 2016-07-13 08:07:59 -07:00
Henry
c8898ac6aa [Documentation] Updated copyright statement. Fixes #1081 2016-07-12 16:55:57 -07:00
Henry
fd29473664 Support resize 2016-07-12 15:02:39 -07:00
Henry
97f3fd516b Changed default duration to fifteen minutes 2016-07-12 10:14:26 -07:00
Henry
088416905d Added duration 2016-07-12 10:08:08 -07:00
Henry
2056d87453 Merge branch 'open933-frontend' into open933 2016-07-11 14:27:30 -07:00
Charles Hacskaylo
64ce8a2b2a [Frontend] Styling for Time Conductor v2 
Fixes #933
Color adjusts, mini super-menu size
and font tweaks, glyphs added to selector,
SVG style fixes in progress
 2016-07-11 14:03:41 -07:00
Henry
585da38a16 Fixed some merge issues 2016-07-11 13:46:46 -07:00
Pete Richards
d05a1cef9b Merge pull request #1060 from nasa/clear-transactions-1046-squashed 
[Edit] Clear transactions on Save As
 2016-07-11 12:25:09 -07:00
Charles Hacskaylo
bf0e85a94c [Frontend] Styling for Time Conductor v2 
Fixes #933
Renamed main class; removed unused <style>
defs
 2016-07-11 11:35:26 -07:00
Charles Hacskaylo
84b7a9dc2f Merge remote-tracking branch 'origin/open933' into open933-frontend 
Fixes #933
Conflicts:
	platform/features/conductor-v2/src/TimeConductorController.js
 2016-07-11 11:29:35 -07:00
Henry
11caa8396a Updated modes 2016-07-11 11:18:23 -07:00
Henry
0017b77439 Merged markup changes 2016-07-11 11:06:22 -07:00
Charles Hacskaylo
7b7b21d748 [Frontend] Styling of Time Conductor v2 
Fixes #933
Tweaks to language; tweak to class name in markup
 2016-07-11 11:05:47 -07:00
Charles Hacskaylo
788483ec13 [Frontend] Styling of Time Conductor v2 
Fixes #933
Tweaks to language
 2016-07-11 10:37:08 -07:00
Charles Hacskaylo
7b19f91ce6 [Frontend] Merge latest from open933 
Fixes #933
Resolve conflicts in
mode-menu.html, mode-selector.html,
time-conductor.html; apply tweaks, language, etc.
 2016-07-11 10:31:14 -07:00
Henry
5cc81ba12a [Time Conductor] Added mode class to time conductor 2016-07-11 10:26:34 -07:00
Charles Hacskaylo
0a0bc55f5f [Frontend] Styling for Time Conductor v2 
Fixes #993
In-progress; mode menu names and
descriptors modified, markup cleaned up
 2016-07-08 17:11:43 -07:00
Henry
4e7b69c4df Enabled fixed and real-time modes 2016-07-08 16:57:50 -07:00
Charles Hacskaylo
cf83040c4b [Frontend] Styling for Time Conductor v2 
Fixes #993
In-progress; Create menu refactoring and new
mini Create menu
 2016-07-08 16:54:49 -07:00
Charles Hacskaylo
32f7bc86af [Frontend] Styling for Time Conductor v2 
Fixes #993
In-progress; class renaming continued,
cleanups in markup file, in-page styles
ported to scss
 2016-07-08 16:54:13 -07:00
Henry
e230b92946 Fixed bug with date selector having to be clicked twice 2016-07-08 15:15:12 -07:00
Henry
58ed500ecf Time sync via conductor 2016-07-07 16:57:03 -07:00
Henry
bca5eb0fdb [Time Conductor] #933 Initial markup 2016-07-07 09:47:46 -07:00
Henry
59e18b9a79 [Search] Amended ClickAwayController to trigger digest via instead of . Fixes #1065 2016-06-30 14:44:39 -07:00
Henry
ea1780364b [Dialog Service] Dismiss individual dialogs. Fixes #254 2016-06-29 20:12:12 -07:00
Pete Richards
652a50c700 Merge remote-tracking branch 'origin/open1018-new' 2016-06-27 09:13:03 -07:00
Victor Woeltjen
d1c01d3c86 Squashed commit of the following: 
commit 3f199a9f06
Merge: 27fe4ed 736cba7
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date:   Mon Jun 27 09:04:40 2016 -0700

    Merge remote-tracking branch 'origin/master' into clear-transactions-1046

    Conflicts:
    	platform/commonUI/edit/src/actions/SaveAsAction.js

commit 27fe4edb30
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date:   Wed Jun 22 15:04:06 2016 -0700

    [Edit] Mark restartTransaction as private API

commit 21d1938a0f
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date:   Wed Jun 22 15:03:17 2016 -0700

    [Edit] Clarify JSDoc

commit 06a83f9fa9
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date:   Wed Jun 22 15:01:35 2016 -0700

    [Edit] Update failing spec

commit 1f525160e0
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date:   Wed Jun 22 14:52:43 2016 -0700

    [Edit] Refer to correct variable

    ...when clearing transactions after a restartTransaction

commit b60e94bce4
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date:   Wed Jun 22 14:38:54 2016 -0700

    [Edit] Clear transactions on Save As

    ...such that only persistence calls associated with the
    saved clones are actually issued. Fixes #1046.
 2016-06-27 09:12:57 -07:00
Andrew Henry
2339560363 [Time Conductor] Bounds updated when date selected from date selector. Fixes #1018 2016-06-24 21:50:59 -07:00
Pete Richards
24e870a126 [Save] Show blocking dialog 
Show a blocking dialog while the save action is being performed.

Prevents users from pressing save a second time or performing
further actions while a save is in progress.

Fixes https://github.jpl.nasa.gov/MissionControl/vista/issues/362
 2016-06-24 20:01:52 -07:00
Victor Woeltjen
48b271b7ca [Edit] Unshadow variable name 
...to satisfy JSHint
 2016-06-22 16:14:49 -07:00
Victor Woeltjen
8244e435bf [Edit] Update failing spec 2016-06-22 16:13:26 -07:00
Victor Woeltjen
a3a0f003f0 [Edit] Don't refresh unpersisted objects 2016-06-22 15:41:06 -07:00
Victor Woeltjen
e42b8d22f7 [Edit] Undirty objects on refresh 
Remove domain objects from the active transaction when they
are refreshed, and use this from the SaveAsAction to prevent
saving unintended changes. Fixes #1046
 2016-06-22 15:32:37 -07:00
Pete Richards
c8f4568bd0 [Plot] Set min height 
Set the min height for the plot element based on user feedback for
minimum plot size that they find useful.  Plot ticks may overlap
but that is expected to be fixed in a future release.

Fixes https://github.com/nasa/openmct/issues/1048
 2016-06-22 10:51:16 -07:00
Henry
c0311be192 [Browse] Inspector shown when object switched to edit mode. Fixes #1031 2016-06-20 20:27:56 -07:00
Victor Woeltjen
cefb40856b Merge pull request #1042 from nasa/open1040 
[Tables] Enabled auto-scroll by default fixes #1040
 2016-06-20 16:24:58 -07:00
Henry
ee7c450e11 [Tables] Enabled auto-scroll by default fixes #1040 2016-06-20 16:18:26 -07:00
Charles Hacskaylo
8080490e5c [Frontend] Applied emphasis colors to .key-properties 
fixes #1014
Added .key-properties to .major to color the Edit
button as intended;
 2016-06-20 16:06:23 -07:00
Victor Woeltjen
a3443d8077 Merge pull request #1025 from nasa/frontend-1019 
R&I fixes for Snow button colors and Timeline edit Add menu
 2016-06-20 12:36:29 -07:00
Charles Hacskaylo
dea94e4e68 [Frontend] Fix button colors in Snow theme 
Fixes #1014
- Problem was actually application of a color
within the .icon class - fix removes that
definition;
 2016-06-16 17:55:40 -07:00
Charles Hacskaylo
d40c7f1821 [Frontend] Restore the Add menu to edit Timelines 
Fixes #1019
- Removed overflow: hidden from .l-edit-controls;
 2016-06-16 17:46:15 -07:00
Charles Hacskaylo
c7e7e0c302 [Frontend] Fixes to un-squish plots 
Fixes #1022
- min-height added to .gl-plot element;
- Moved plot value definitions out of _plots-main
and into _constants and normalized naming;
 2016-06-16 17:24:44 -07:00
Pete Richards
8ac6ac97f0 Merge remote-tracking branch 'origin/open972' 2016-06-16 11:08:43 -07:00
Henry
c2517c1670 [Edit Mode] Canceling edit mode with unsaved changes now shows confirmation dialog to user. Fixes #664 2016-06-15 17:10:29 -07:00
Andrew Henry
717ceff02c Merge pull request #995 from nasa/timeline-913a 
R&I tweaks to Timeline scrollbar and splitters
 2016-06-15 11:45:17 -07:00
Victor Woeltjen
6878c59f45 Merge pull request #1016 from nasa/fix-1013 
[Persistence] Use identifier service to get key
 2016-06-15 11:18:13 -07:00
Pete Richards
c00b053aa7 [Tests] verify that identifier service provides key 
Verify that the results of the identifier service are used for
persistence calls instead of the domain object id.

https://github.com/nasa/openmct/issues/1013
 2016-06-15 10:31:25 -07:00
Victor Woeltjen
50bd233b0a Merge remote-tracking branch 'origin/master' into table-export-934 
Conflicts:
	platform/commonUI/general/res/sass/controls/_buttons.scss
	platform/features/table/res/templates/mct-table.html
 2016-06-15 10:05:20 -07:00
Henry
79406cf1ed [Tables] #972 Refactored to simplify code. Fixes #972 2016-06-14 16:34:07 -07:00
Pete Richards
2d5824c4ab [Persistence] Use identifier service to get key 
Retrieve key from identifier service for all persist operations.

Fixes https://github.com/nasa/openmct/issues/1013
 2016-06-14 10:56:54 -07:00
Pete Richards
3480809129 Merge remote-tracking branch 'origin/open629' 2016-06-14 10:44:58 -07:00
Pete Richards
11bc48c7e0 Merge remote-tracking branch 'origin/timeline-console-error-978' 2016-06-14 10:41:26 -07:00
Pete Richards
d759401b69 Merge remote-tracking branch 'origin/open1000' 2016-06-14 10:38:51 -07:00
Victor Woeltjen
0aebecfbb0 Merge pull request #987 from nasa/anim-to-edit-709 
[Frontend] Animation added to transition from browse to edit mode
 2016-06-13 13:31:49 -07:00
Pete Richards
531d40993a Merge remote-tracking branch 'origin/better-dialog-message-339' 2016-06-10 14:55:07 -07:00
Pete Richards
4c097faf88 Merge remote-tracking branch 'origin/timeline-flash-997' 2016-06-10 14:50:36 -07:00
Victor Woeltjen
5152e64895 [Duplicate] Allow copy across spaces 
Fixes #1007
 2016-06-10 11:38:55 -07:00
Andrew Henry
acd0fae040 [Tables] Recalculate column dimensions on resize. Fixes #861 2016-06-09 12:59:46 +01:00
Andrew Henry
29dd51439d [Date Input] Addressed issues with date selector. Fixes #1000 2016-06-08 17:37:26 +01:00
Victor Woeltjen
a1b2175801 [Timeline] Reduce flicker 
Reposition scroll bar in Timeline with RAF instead of timeout;
this ensures that scroll bar is positioned after the current
digest (updating the width) but before the results are rendered
(avoiding flicker.) Fixes #997
 2016-06-07 10:05:51 -07:00
Charles Hacskaylo
8e0858bb24 [Frontend] Tweaks to splitter dimensions 
Fixes #913
- Tightened up splitter height and width;
- Added hover color for snow theme;
 2016-06-03 10:00:16 -07:00
Victor Woeltjen
23b64951f3 [Timeline] Update zoom controller spec 
...to reflect changes/simplifications for #936.
 2016-06-02 16:42:09 -07:00
Victor Woeltjen
99590d18f7 [Timeline] Simplify bounds-tracking 2016-06-02 16:40:07 -07:00
Victor Woeltjen
86b31bc040 [Timeline] Simplify scroll-setting 2016-06-02 16:38:11 -07:00
Victor Woeltjen
d52bfed1df [Timeline] Always set scroll on timeout 
...to allow time for width to increase.
 2016-06-02 16:36:09 -07:00
Charles Hacskaylo
808ccd0376 [Frontend] Tweaks to splitter 
Fixes #913
- IN PROGRESS: working on making
smaller splitter in Timelines
 2016-06-02 16:23:42 -07:00
Victor Woeltjen
44d6456de1 [Timeline] Set scroll on timeout 
Whenever timeline zoom controller sets scroll, check to see if
there may be a width violation that causes scroll to be reset,
and retry on a timeout if so. Fixes #936.
 2016-06-02 16:05:28 -07:00
Charles Hacskaylo
a394b95259 [Frontend] Tweaks to scrollbar visibility 
Fixes #913
- Scrollbar now always visible in the right side
of the tabular area, in order to avoid column
bottom edges not aligning;
 2016-06-02 16:04:26 -07:00
Victor Woeltjen
d02f4041b2 [Timeline] Update scroll position on timeout 
Fixes #817
 2016-06-02 15:34:32 -07:00
Victor Woeltjen
026ece3956 [Timeline] Provide greater initial width 
This avoids starting with a scrollable width too small for the
initial scroll position that the zoom controller selects.
Fixes #817
 2016-06-02 14:48:58 -07:00
Charles Hacskaylo
214a843dba [Frontend] New message for copy in-progress dialog 
fixes #339
 2016-06-02 11:09:22 -07:00
Andrew Henry
1d6880c283 Merge pull request #982 from nasa/timeline-scroll-981 
[Timeline] Use reasonable width for scroll area
 2016-06-02 16:59:08 +01:00
Andrew Henry
f167022eea Changed logic of persisted check slightly 2016-06-02 10:26:38 +01:00
Charles Hacskaylo
76edba1014 [Frontend] Mods to Edit button 
fixes #709
- Changed title and style of main Edit button;
- Updated EditItem.js protractor ID accordingly;
 2016-06-01 19:19:58 -07:00
Charles Hacskaylo
7904989a23 [Frontend] Added transitional animation to Edit mode 
fixes #709
- When going from browse to edit mode, the wrapper
around the object being edited will now transition in
from its edges, and the edit controls toolbar will
animate its height;
- There is no transition applied for going from edit
to browse; to do this we'd need to mod the JS on
exiting to look for the end of an animation event;
- Tested in Chrome, Safari and Firefox;
- May not be smooth with very complex objects
like Layouts with a large number of components;
- Added transitional animations to .l-object-wrapper
and .l-edit-controls;
- New 'animTo' mixin added to _effects.scss;
 2016-06-01 19:18:55 -07:00
Victor Woeltjen
ea676b4368 Merge remote-tracking branch 'origin/master' into table-export-934 2016-06-01 10:33:53 -07:00
Andrew Henry
b1266abf01 [Edit] Fixed issue with cancel action throwing an error. Fixes #979 2016-06-01 10:41:01 +01:00
Victor Woeltjen
cc7d0477e8 [Timeline] Check for existence of timespan 
...before attempting to calculate a width based on it.
Fixes #978.
 2016-05-31 16:41:30 -07:00
Victor Woeltjen
5a2d1a746d [Timeline] Add missing semicolon 2016-05-31 16:27:59 -07:00
Victor Woeltjen
4f0e3fdf85 [Timeline] Test zoom controller's width 2016-05-31 16:21:40 -07:00
Victor Woeltjen
be9f56107c [Timeline] Remove obsolete test cases 2016-05-31 16:15:57 -07:00
Victor Woeltjen
787f3815df [Timeline] Expose width from ZoomController 
...and ensure that the width exposed is not excessively
large; fixes #981
 2016-05-31 16:12:49 -07:00