Commit Graph

2035 Commits

Author SHA1 Message Date
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
2339560363 [Time Conductor] Bounds updated when date selected from date selector. Fixes #1018 2016-06-24 21:50:59 -07:00
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
48b271b7ca [Edit] Unshadow variable name
...to satisfy JSHint
2016-06-22 16:14:49 -07:00
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
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
c0311be192 [Browse] Inspector shown when object switched to edit mode. Fixes #1031 2016-06-20 20:27:56 -07:00
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
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
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
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
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
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
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
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
3480809129 Merge remote-tracking branch 'origin/open629' 2016-06-14 10:44:58 -07:00
d759401b69 Merge remote-tracking branch 'origin/open1000' 2016-06-14 10:38:51 -07:00
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
29dd51439d [Date Input] Addressed issues with date selector. Fixes #1000 2016-06-08 17:37:26 +01:00
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
808ccd0376 [Frontend] Tweaks to splitter
Fixes #913
- IN PROGRESS: working on making
smaller splitter in Timelines
2016-06-02 16:23:42 -07:00
f167022eea Changed logic of persisted check slightly 2016-06-02 10:26:38 +01:00
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
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
ea676b4368 Merge remote-tracking branch 'origin/master' into table-export-934 2016-06-01 10:33:53 -07:00
b1266abf01 [Edit] Fixed issue with cancel action throwing an error. Fixes #979 2016-06-01 10:41:01 +01:00
8b9c51f303 [Frontend] Styling Export button
fixes #973
- Done;
- Styling for Export button and tabular view
area in layout frame context;
- Export button in frame context now
hidden until user hovers over tabular
view area in frame, includes animated
transition;
- Normalized line-height on button and
menu elements in frame context;
- Layout/markup/SASS for historical and
RT tabular view modified;
- Converted imagery.html layout
to use flexbox;
2016-05-31 11:40:31 -07:00
661b3d5889 [Frontend] Styling Export button
fixes #973
- In progress:
- Added new download symbol to symbols font;
- Added export symbol to export button;
- Layout/markup/SASS for historical tabular
view modified;
2016-05-31 09:50:12 -07:00
dc577d4c24 Merge pull request #974 from nasa/open970
R&I open970: hide nav-to-parent arrow when in Edit mode
2016-05-27 14:56:48 -07:00
8f7a5e113b Merge pull request #951 from nasa/orphan-navigation-765
[Navigation] Prevent navigation to orphan objects
2016-05-27 14:53:33 -07:00
9820f9d9c5 [Frontend] Mod CSS to properly hide nav-to-parent when editing
fixes #970
Not sure what problem was, but betting this was due to removal
of an ng-class previously in markup;
2016-05-26 12:45:25 -07:00
56ff98cce7 Merge branch 'master' into orphan-navigation-765 2016-05-26 12:35:48 -07:00
eda1f23df9 [Edit Mode] #629 rewriting disabled tests 2016-05-26 11:38:12 -07:00
f1113fda24 [Frontend] New message for unsaved changes warning
open #747
2016-05-26 09:04:40 -07:00
eefd4c8669 Merge pull request #949 from nasa/info-error-948
[Mobile] Remove usage of element.scope()
2016-05-25 15:15:53 -07:00
7501f679f7 [Style] Fixed style issues introduced by #954 2016-05-25 12:10:39 -07:00
52e087d8f8 Merge pull request #954 from nasa/open628
[Edit Mode] #628 Remove edit related concerns from Create Action
2016-05-25 11:55:17 -07:00
2ff0c7b06a [Test] Add spy method for addClass
Add spy method, fix a merge conflict that was improperly resolved
in https://github.com/nasa/openmct/pull/922
2016-05-25 10:11:34 -07:00
ff92d3acab Merge remote-tracking branch 'origin/open889' into open922 2016-05-25 09:55:09 -07:00
32d7187db6 Relocated creation package to edit bundle 2016-05-24 17:08:12 -07:00
f0ab817e87 Added tests, and fixed failing ones 2016-05-24 10:53:04 -07:00
96af931c0b Modified EditActionPolicy to prevent editing of table views unless object is a table type 2016-05-23 16:48:31 -07:00
eff46b076c [New Edit Mode] #628 Removed duplicate logic from Create Action 2016-05-23 15:03:20 -07:00
1ced47fc2c [Navigation] Prevent navigation to orphan objects
This is particularly useful when a persistence failure has caused
a created object not to be added to its parent container. #765
2016-05-23 14:07:09 -07:00
6e7f4df5e3 [Mobile] Remove usage of element.scope()
Usage is unnecessary and is sensitive to initialization ordering of
representations, resulting in #948.
2016-05-20 16:13:51 -07:00
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
b6502e9ea1 [New Edit Mode] #633 Removed Editing workflow concerns from FixedController, LayoutController 2016-05-20 14:12:24 -07:00
9861e63589 [Code Style] Run fixstyle on merged changes 2016-05-20 13:09:16 -07:00
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
ad5691142e [Code Style] Rename shadowing variables 2016-05-20 13:05:32 -07:00