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
Victor Woeltjen
35d7d9b380
[Timeline] Remove width method
...
...from TimelineController. Will replace with a more straightforward
call to the zoom controller that uses the exposed end time instead,
to address #981 .
2016-05-31 16:05:06 -07:00
Charles Hacskaylo
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
Charles Hacskaylo
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
Andrew Henry
01c85cb58d
[Table] #972 Further refactoring, tests, style fixes
2016-05-31 12:05:40 +01:00
Henry
0218f42e2b
removed redundant code
2016-05-27 15:25:06 -07:00
Henry
d8d0f22889
Second rewrite
2016-05-27 15:14:46 -07:00
Henry
d8a097a95a
[Tables] Added timeouts to yield control to ui thread. Fixes #972
2016-05-27 15:14:45 -07:00
Andrew Henry
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
Andrew Henry
8f9308de01
Merge pull request #962 from nasa/csv-export-update-751
...
[Timeline] Updates to CSV Export
2016-05-27 14:55:59 -07:00
Andrew Henry
8f7a5e113b
Merge pull request #951 from nasa/orphan-navigation-765
...
[Navigation] Prevent navigation to orphan objects
2016-05-27 14:53:33 -07:00
Charles Hacskaylo
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
Victor Woeltjen
56ff98cce7
Merge branch 'master' into orphan-navigation-765
2016-05-26 12:35:48 -07:00
Victor Woeltjen
dade6b2254
[Timeline] Use positive logic for clarity
...
https://github.com/nasa/openmct/pull/962#discussion_r64678013
2016-05-26 12:12:52 -07:00
Victor Woeltjen
e9cac6eff3
[Timeline] Add JSDoc for new parameter
...
https://github.com/nasa/openmct/pull/962#discussion_r64677520
2016-05-26 12:12:52 -07:00
Andrew Henry
a88b4b31a1
Merge pull request #966 from nasa/open747
...
R&I open747: refined "unsaved changes" dialog message
2016-05-26 12:02:12 -07:00
Henry
7fc2fcfa07
[Edit Mode] #629 Rewrote obsolete DomainColumn tests
2016-05-26 11:55:13 -07:00
Victor Woeltjen
5689279954
[Timeline] Add JSDoc for idMap
...
https://github.com/nasa/openmct/pull/962#discussion_r64676750
https://github.com/nasa/openmct/pull/962#discussion_r64677198
2016-05-26 11:53:16 -07:00
Victor Woeltjen
04112956cf
Merge pull request #964 from nasa/open913
...
R&I open913: various Timeline fixes
2016-05-26 11:47:06 -07:00
Henry
165e158f37
[Edit Mode] #629 Removed redundant test from DomainObjectProviderSpec
2016-05-26 11:44:43 -07:00
Henry
f301741852
[Edit Mode] #629 restored disabled tests for DropGesture. Removed extraneous argument to broadcast function
2016-05-26 11:42:15 -07:00
Henry
eda1f23df9
[Edit Mode] #629 rewriting disabled tests
2016-05-26 11:38:12 -07:00
Victor Woeltjen
d15d27af73
Merge branch 'master' into table-export-934
2016-05-26 10:42:35 -07:00
Charles Hacskaylo
f1113fda24
[Frontend] New message for unsaved changes warning
...
open #747
2016-05-26 09:04:40 -07:00
Charles Hacskaylo
33c208d8fe
[Frontend] Timeline Gantt bar mods to allow small min-width
...
open #965
- CSS adjusted to handle min-width of 2px and better
approach to ellipsizing text;
- Angular ng-class added to hide icon and title if
width less than a value;
- Rounded corners on bars removed;
2016-05-25 20:52:36 -07:00
Charles Hacskaylo
c557fb6cd5
[Frontend] Cursor properties modified
...
open #768
2016-05-25 19:39:56 -07:00
Charles Hacskaylo
bde2bc7709
[Frontend] Bottom of holder divs adjusted
...
open #913
2016-05-25 19:28:28 -07:00
Andrew Henry
5fe759aa91
Merge pull request #955 from nasa/timeline-zoom-936
...
[Timeline] Improve zoom behaviors
2016-05-25 16:58:20 -07:00
Victor Woeltjen
a5b7badb95
[Timeline] Remove obsolete arguments
...
https://github.com/nasa/openmct/pull/955/files#r64668507
2016-05-25 16:08:28 -07:00
Andrew Henry
eefd4c8669
Merge pull request #949 from nasa/info-error-948
...
[Mobile] Remove usage of element.scope()
2016-05-25 15:15:53 -07:00
Victor Woeltjen
438511c5f7
[Table] Test CSV Export behavior
2016-05-25 15:07:17 -07:00
Victor Woeltjen
3eb960cf5a
[Table] Move export button out of scroll
2016-05-25 14:50:06 -07:00
Victor Woeltjen
699f6ba458
[Table] Export table contents as CSV
2016-05-25 13:54:10 -07:00
Victor Woeltjen
f21f22d95c
[Table] Tweak appearance of export button
2016-05-25 13:43:44 -07:00
Victor Woeltjen
b520d08818
[Table] Begin work on CSV export
...
#934
2016-05-25 13:23:19 -07:00
Victor Woeltjen
f9fd97230f
[Timeline] Satisfy JSHint
2016-05-25 12:37:03 -07:00
Victor Woeltjen
536e2290b8
Merge branch 'master' into csv-export-update-751
2016-05-25 12:33:43 -07:00
Victor Woeltjen
73b922facf
[Timeline] Update specs for indexes instead of ids
2016-05-25 12:32:44 -07:00
Victor Woeltjen
ba0d9a186b
[Timeline] Account for new argument in spec
2016-05-25 12:26:47 -07:00
Victor Woeltjen
80f5cb756d
[Timeline] Account for new argument in spec
2016-05-25 12:25:58 -07:00
Victor Woeltjen
d7f566088f
[Timeline] Update spec to include logging
2016-05-25 12:25:02 -07:00
Victor Woeltjen
a3bcaea7f9
[Timeline] Show units in utilization headers
2016-05-25 12:21:58 -07:00
Victor Woeltjen
23c71b7218
[Timeline] Include units for utilizations
2016-05-25 12:12:11 -07:00
Henry
7501f679f7
[Style] Fixed style issues introduced by #954
2016-05-25 12:10:39 -07:00
Victor Woeltjen
463f7ccf65
[Timeline] Use indexes instead of UUIDs
2016-05-25 12:07:35 -07:00
Victor Woeltjen
87fe407739
Merge branch 'master' into csv-export-update-751
2016-05-25 12:00:43 -07:00
Victor Woeltjen
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
Andrew Henry
c5cd495fce
Merge pull request #952 from nasa/fix-build-142
...
[Code Style] Run code style checks on CircleCI
2016-05-25 11:49:54 -07:00
Pete Richards
37a417051d
Merge remote-tracking branch 'origin/missing-time-conductor-957'
2016-05-25 11:43:57 -07:00
Victor Woeltjen
3935378b0c
Revert "[Timeline] Test mct-representation ordering"
...
This reverts commit 2a4004fd5b
.
2016-05-25 11:34:29 -07:00
Victor Woeltjen
952f95aa4c
[Timeline] Update failing specs
2016-05-25 11:33:51 -07:00
Victor Woeltjen
0a75a5be1f
[Timeline] Add minimal test case
2016-05-25 11:28:00 -07:00
Victor Woeltjen
70b593e28a
[Timeline] Watch for configuration object
...
...to address #908 in a manner which does not cause #957
2016-05-25 11:22:22 -07:00
Victor Woeltjen
ed69a65f9b
[Representation] Restore ordering in mct-representation
...
Revert "[Timeline] Change ordering in mct-representation"
This reverts commit 20ecf168f2
.
These changes introduced a regression due to ordering
expected by time conductor, #957
2016-05-25 11:03:32 -07:00
Victor Woeltjen
bb4f1ce7cd
[Timeline] Include utilization columns
2016-05-25 10:52:25 -07:00
Victor Woeltjen
0cc2ba7595
[Timeline] Import UtilizationColumn
2016-05-25 10:38:00 -07:00
Victor Woeltjen
8162429106
[Timeline] Pass in resources extensions
2016-05-25 10:37:01 -07:00
Victor Woeltjen
ed519d89d7
[Timeline] Log errors during CSV export
...
#751
2016-05-25 10:35:29 -07:00
Victor Woeltjen
0e4f6185b8
Merge branch 'master' into csv-export-update-751
...
Conflicts:
platform/features/timeline/bundle.js
2016-05-25 10:29:56 -07:00
Pete Richards
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
Pete Richards
ff92d3acab
Merge remote-tracking branch 'origin/open889' into open922
2016-05-25 09:55:09 -07:00
Henry
32d7187db6
Relocated creation package to edit bundle
2016-05-24 17:08:12 -07:00
Victor Woeltjen
00534f8af7
[Timeline] Account for tick size
...
Account for tick size in duration reported by TimelineZoomController,
to avoid tick marks being cut off prematurely due to changes for
#936
2016-05-24 13:02:30 -07:00
Victor Woeltjen
3795570938
[Timeline] Rename shadowing variable
2016-05-24 12:45:25 -07:00
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
Henry
f0ab817e87
Added tests, and fixed failing ones
2016-05-24 10:53:04 -07:00
Henry
96af931c0b
Modified EditActionPolicy to prevent editing of table views unless object is a table type
2016-05-23 16:48:31 -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
Henry
eff46b076c
[New Edit Mode] #628 Removed duplicate logic from Create Action
2016-05-23 15:03:20 -07:00
Victor Woeltjen
1c007ea256
[Code Style] Remove trailing whitespace
...
...to fix build after changes for #142 .
2016-05-23 14:55:04 -07:00
Victor Woeltjen
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
Victor Woeltjen
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
Henry
fd9d766913
Defer resolution of scope in DropGesture
2016-05-20 15:15:18 -07:00
Henry
b6502e9ea1
[New Edit Mode] #633 Removed Editing workflow concerns from FixedController, LayoutController
2016-05-20 14:12:24 -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
Andrew Henry
6fb36374f6
Merge pull request #942 from nasa/persist-graph-toggles-908
...
[Timeline] Persist resource graph toggles
2016-05-20 13:27:41 -07:00
Victor Woeltjen
9861e63589
[Code Style] Run fixstyle on merged changes
2016-05-20 13:09:16 -07:00
Victor Woeltjen
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
Victor Woeltjen
ad5691142e
[Code Style] Rename shadowing variables
2016-05-20 13:05:32 -07:00
Victor Woeltjen
1419ff86e8
Merge pull request #946 from nasa/open636
...
[New Edit Mode] #636 Removed edit concerns from DropGesture
2016-05-20 10:52:11 -07:00
Henry
601bc03ba2
[New Edit Mode] #636 Modified EditAndCompose action to rely on a slightly refactored EditActionPolicy to remove folder specific logic
2016-05-20 10:42:17 -07:00
Henry
776586ae25
[New Edit Mode] #634 Removed edit concerns from MctRepresentation
2016-05-19 17:09:56 -07:00
Victor Woeltjen
2a4004fd5b
[Timeline] Test mct-representation ordering
...
Verify that a configuration object has been added to scope before
changing templates. #908
2016-05-19 15:09:57 -07:00
Victor Woeltjen
b5229d7786
[Timeline] Commit changes on toggle
...
#908
2016-05-19 15:06:06 -07:00
Victor Woeltjen
20ecf168f2
[Timeline] Change ordering in mct-representation
...
...such that the configuration property is available in scope
when a view is first instantiated. #908
2016-05-19 15:00:12 -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
Victor Woeltjen
de43aa81be
Merge pull request #838 from nasa/open824_rebase
...
[Edit] #824 - Remove EditableDomainObject
2016-05-18 17:01:24 -07:00
Charles Hacskaylo
a729edd399
[Frontend] Label context arrows now always visible
...
open #929
- Also enable frame dragging in title area when
editing in Layout;
- CSS and markup changes;
2016-05-16 12:00:29 -07:00
Henry
54a0de4a08
[New Edit Mode] #636 Removed edit concerns from DropGesture
2016-05-13 17:59:43 -07:00
Henry
a11dba88b2
[New Edit Mode] #634 Removed edit concerns from MctRepresentation
2016-05-12 20:23:33 -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
4b786d3536
Removed sysouts
2016-05-12 16:09:08 -07:00
Henry
e6bbc3442b
Resolved merge conflicts
2016-05-12 16:09:02 -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
Victor Woeltjen
3d891073da
[Popup] Add method to jqlite mocks
...
...to resolve build failure preventing merge,
https://github.com/nasa/openmct/pull/922#issuecomment-218588876
2016-05-11 14:25:23 -07:00
Victor Woeltjen
116c6e57ed
Merge pull request #918 from nasa/rt-updates-910
...
[Table] Remove length check when updating visible rows
2016-05-11 14:07:27 -07:00
Charles Hacskaylo
73c2c01def
[Frontend] Layout and styling of Time Conductor
...
open #889
open #298
Fixes for mobile;
Moved popup z-index def into sass;
Datetime picker compressed for
better fit in mobile phone;
Removed hours selector from datetime
picker to enable better fit in mobile;
2016-05-11 11:32:39 -07:00
Charles Hacskaylo
7c82e31b66
Merge branch 'master' into open889
2016-05-10 23:09:59 -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
Charles Hacskaylo
2829b8d495
[Frontend] Time Conductor mobile
...
open #889
- Major refactoring of mobile approach,
leveraging flex-box layout change;
2016-05-10 19:52:11 -07:00
Victor Woeltjen
c448753bab
[Table] Remove length check when updating visible rows
...
While the number of visible rows may not have changed, their
contents may have; returning early here results in #910 .
2016-05-10 15:20:22 -07:00
Charles Hacskaylo
7ade873365
[Frontend] Flex; Tweaks to slider knobs
...
open #889
- Converted TC elements to use flex
layout instead of abs pos;
- Knob size increased;
- Knob grippies added;
2016-05-10 15:12:50 -07:00
Charles Hacskaylo
8788523c25
[Frontend] Tweaks to slider knobs
...
open #889
- Knob size increased;
- Knob grippies added;
2016-05-10 14:28:23 -07:00
Charles Hacskaylo
c301523156
[Frontend] Layout and positioning fixes for TC controls
...
open #889
IN PROGRESS
- Smaller font used on range value;
- More space allocated to left and right
for slider range values;
- Style tweaks to slider look;
- Layout and style of datetime inputs
fixed;
- Input error colors fixed, moved to
theme constants;
2016-05-09 17:56:50 -07:00
Charles Hacskaylo
2e8604e18d
[Frontend] Layout and positioning fixes for TC controls
...
open #889
2016-05-09 10:38:18 -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
4c74391137
Merge remote-tracking branch 'origin/open836'
2016-05-09 10:25:25 -07:00
Pete Richards
f3b265bdd5
Merge branch 'master' into open671
2016-05-09 10:19:24 -07:00
Charles Hacskaylo
cae85f3e30
[Frontend] Mods to slider .range-value elems
...
open #889
- Text smaller, line breaks;
- Height adjustments
- Increased with of slider area;
2016-05-09 10:16:54 -07:00
Victor Woeltjen
3efaa3b1cb
Merge pull request #894 from nasa/open892
...
#892 Removed browser warning
2016-05-06 09:51:36 -07:00
Victor Woeltjen
2fe9698ea8
Merge pull request #891 from nasa/fix-clickaway-888
...
[General] remove dupe, debounce inputs
2016-05-06 09:49:13 -07:00
Henry
00433f02bc
#892 Removed browser warning
2016-05-05 21:45:18 -07:00
Pete Richards
7fad4e9ea1
[General] remove dupe, debounce inputs
...
Remove duplicate ClickAwayController implementation that was obscuring actual
implementation. Debounce clickaway action in case toggle is invoked in a
click handler.
Resolves https://github.com/nasa/openmct/issues/888
2016-05-05 18:25:37 -07:00
Andrew Henry
c6d326bbbc
Merge pull request #879 from nasa/table-headers-809
...
[Table] Fix headers in firefox
2016-05-05 13:29:03 -07:00
Pete Richards
1c6ef28b80
[Table] Fix headers in firefox
...
Don't use table-cell displays for cells, resolves issues with zero-sized
tbody causing thead to be 100% of table size.
Fixes https://github.com/nasa/openmct/issues/809
2016-05-04 11:13:12 -07:00
Victor Woeltjen
5279c842f5
[Branding] Change title of about dialog
2016-05-04 10:17:23 -07:00
Charles Hacskaylo
ff36d9ee80
[Frontend] Removed bullets from ol, ul
...
open #869
- This should be cherry-picked into main
branches as well.
(cherry picked from commit 4c97413
)
2016-04-29 10:54:28 -07:00
Charles Hacskaylo
0390f46460
[Frontend] z-index added to .object-top-bar .left element
...
#836
2016-04-25 09:55:21 -07:00
Andrew Henry
6bf1ef5bcc
Revert "Revert "[Tables] Fix to correct sorting in realtime tables""
2016-04-22 09:44:34 -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
Victor Woeltjen
f16a107105
[Timeline] Inject resources into CSV action
2016-04-15 08:51:22 -07:00
Victor Woeltjen
f683ca44a2
[Timeline] Read resource utilizations during CSV export
2016-04-15 08:45:42 -07:00
Victor Woeltjen
546cde56a8
[Timeline] Expose internal resource utilization
...
...to allow this to be exported for CSV, #751
2016-04-15 08:32:34 -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
Victor Woeltjen
ffd5faf9a2
[Persistence] Remove obsolete caching decorator
...
#831
2016-04-14 10:15:40 -07:00
Pete Richards
b682cf8340
[Style] Remove outdated comments
2016-04-13 17:41:24 -07:00
Pete Richards
22a5122ab7
[Conductor] Style for Phone and Tablet
...
Specify styles for time conductor on phone an tablet to hide the slider and
utilize space better.
https://github.com/nasa/openmct/issues/318
2016-04-13 17:17:52 -07:00
Pete Richards
7a7877d7c4
[Conductor] Add basic style for phone
...
Add styling for time conductor on mobile that removes slider and rearranges
inputs to utilize space more effectively.
https://github.com/nasa/openmct/issues/318
2016-04-13 16:17:17 -07:00
Pete Richards
69c059c943
[Conductor] Update inner bound on blur
...
The time conductor updates the inner and outer bounds when the input is
blurred, which results in the query updating without dragging.
Also allows time conductor to be utilized on mobile devices by entering
dates directly.
https://github.com/nasa/openmct/issues/318
User request:
https://github.jpl.nasa.gov/MissionControl/vista/issues/175
2016-04-13 13:49:23 -07:00
Pete Richards
6d58f23c0c
[Style] Switch to prototype
...
Switch TimeRangeController to prototype style, and update tests
and template to utilize new style.
2016-04-13 13:23:33 -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
9351285182
[Build] Remove obsolete argument from spec
...
...to reflect changes associated with JSHint configuration,
https://github.com/nasa/openmct/pull/724#issuecomment-193542314
2016-04-08 16:31:01 -07:00
Victor Woeltjen
aa45e53440
[Build] Revert setTimeout changes
...
Restore usage of setTimeout (instead of the Angular-wrapped version) per
https://github.com/nasa/openmct/pull/724#issuecomment-193542314
2016-04-08 16:29:49 -07:00
Victor Woeltjen
f6a9c90cef
[Build] Use native bind
...
...in CouchPersistenceProvider and ElasticPersistenceProvider, per
https://github.com/nasa/openmct/pull/724#issuecomment-193542314
2016-04-08 16:25:32 -07:00
Victor Woeltjen
0b11ddbcfd
[Build] Satisfy JSHint
...
Restore globals lost during removal due to merge, remove unused
variables and use threequals in new scripts.
2016-04-08 16:22:40 -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
Victor Woeltjen
8f4f0cb78e
Merge pull request #785 from nasa/open677_cleanup
...
[Timelines] #677 Removed temporary markup
2016-04-05 12:24:58 -07:00
Pete Richards
e0a2d02d23
[Control] Color input shows selected color
...
Update color input to show selected color when expanded.
2016-04-05 11:57:45 -07:00
Victor Woeltjen
70acef6905
[Instantiation] Ensure new models have modified timestamp
...
...to avoid https://github.com/nasa/openmct/issues/745#issuecomment-204561163
2016-04-01 14:27:26 -07:00
Victor Woeltjen
da09ffd3fa
[Persistence] Don't evict models on persist
...
https://github.com/nasa/openmct/issues/745#issuecomment-204559209
2016-04-01 13:38:13 -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
Pete Richards
d35fccbbe8
Revert "Merge remote-tracking branch 'origin/open793'"
...
This reverts commit f49552779a
, reversing
changes made to e068173f3e
.
2016-03-31 16:30:35 -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
Pete Richards
f49552779a
Merge remote-tracking branch 'origin/open793'
2016-03-31 14:14:08 -07:00
Henry
200a426f17
[Tables] Addressed style concerns from code review
2016-03-31 12:56:29 -07:00
Pete Richards
e068173f3e
Merge remote-tracking branch 'origin/move-copy-policy-792'
2016-03-31 12:49:06 -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