Pete Richards
3480809129
Merge remote-tracking branch 'origin/open629'
2016-06-14 10:44:58 -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
Andrew Henry
29dd51439d
[Date Input] Addressed issues with date selector. Fixes #1000
2016-06-08 17:37:26 +01: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
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
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
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
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
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
Henry
eda1f23df9
[Edit Mode] #629 rewriting disabled tests
2016-05-26 11:38:12 -07:00
Charles Hacskaylo
f1113fda24
[Frontend] New message for unsaved changes warning
...
open #747
2016-05-26 09:04:40 -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
Henry
7501f679f7
[Style] Fixed style issues introduced by #954
2016-05-25 12:10:39 -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
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
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
Henry
eff46b076c
[New Edit Mode] #628 Removed duplicate logic from Create Action
2016-05-23 15:03:20 -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
Victor Woeltjen
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
Henry
b6502e9ea1
[New Edit Mode] #633 Removed Editing workflow concerns from FixedController, LayoutController
2016-05-20 14:12:24 -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
e3208187bf
Merge branch 'master' into persist-on-mutation-825
...
Conflicts:
platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js
2016-05-20 10:59:54 -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
bcf85db9c4
[Persistence] Delegate new 'persisted' method
2016-05-19 13:31:27 -07:00
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
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
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
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
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
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
Victor Woeltjen
5279c842f5
[Branding] Change title of about dialog
2016-05-04 10:17:23 -07:00
Victor Woeltjen
8756b7213f
[Persistence] Remove persistence usage from EditRepresenter
2016-04-29 11:35:00 -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
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
Charles Hacskaylo
0390f46460
[Frontend] z-index added to .object-top-bar .left element
...
#836
2016-04-25 09:55:21 -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
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
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
Charles Hacskaylo
a01f7ddd2d
[Frontend] Refinements to .loading and related
...
#445
Markup enhanced in wait-node.html;
More wait-spinner constants added;
Normalized appearance between tree-based
.loading and .s-status-pending;
Fixed .s-status-pending to work now that
mct-representation is gone from tree;
2016-03-24 15:10:22 -07:00
Charles Hacskaylo
e7e91e21fc
[Frontend] Markup and CSS for loading tree items
...
#445
New wait-spinner constants;
Markup fixed in wait-node.html;
Styles for .loading when applied to
.tree-item.wait-node;
Changed from percent-of-parent-
width sizing of spinner to fixed size;
2016-03-24 15:10:02 -07:00
Pete Richards
cc5d14deec
Merge branch '755a'
2016-03-24 13:21:59 -07:00
Pete Richards
cd7ff8ad85
Merge remote-tracking branch 'origin/timestamps-776'
2016-03-24 13:09:32 -07:00
Pete Richards
fa5d59bff8
Merge branch 'timeline-save-770b'
2016-03-24 13:06:53 -07:00
Charles Hacskaylo
0643fb1f3f
[Frontend] Updated icomoon project file
...
#781
2016-03-23 19:17:39 -07:00
Charles Hacskaylo
289debf19d
[Frontend] Fixed hover problem with menu items
...
#781
#187
Noticed a problem with <a> tags in
Create menu items and fixed with display: block;
2016-03-23 19:10:59 -07:00
Charles Hacskaylo
528169de2c
[Frontend] Updated glyphs
...
#781
Added multiple new and updated glyphs;
Updated glyph defs for Historic and
Real-Time Tables;
2016-03-23 17:42: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
a411bac331
[Time Format] Append Z instead of zone offset
...
...for brevity (reduce visual noise)
2016-03-21 14:29:24 -07:00
Victor Woeltjen
5624c7d545
[Time Formats] Display UTC with milliseconds
...
#776
2016-03-21 13:04:59 -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
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
Victor Woeltjen
d12111d9b8
[Add] Fix promise chaining in AddAction
2016-03-21 10:32:02 -07:00
Victor Woeltjen
8fa030437e
[Add] Remove edit awareness
...
Remove step where Added objects are persisted via the editor
capability; instead, persist via the usual persistence capability,
such that Edit mode may intervene (or not) as necessary.
As instantiated models are cached at least until persisted,
this workaround to allow newly-created models to be available
during editing is no longer necessary (and undesired consequences
such as #770 no longer occur)
2016-03-21 10:22:25 -07:00
Pete Richards
8f6a287fb8
Merge remote-tracking branch 'origin/tree-refresh-745'
2016-03-17 11:40:53 -07:00
Victor Woeltjen
07d554d114
Merge pull request #759 from nasa/700a
...
Review and integrate 700a
2016-03-17 11:02:22 -07:00
Charles Hacskaylo
1f09b7b0ac
[Frontend] Fix for scrollbar flicker
...
#748
Was able to observe problem in Mac
Chrome. Moved body, html overflow: hidden
into startup-base.scss and change seems
to have fixed the problem;
2016-03-16 17:34:28 -07:00
Andrew Henry
b0cf9bbd29
Merge pull request #758 from nasa/error-message-753
...
[Tree] Don't assume context capability is present
2016-03-16 15:33:59 -07:00
Charles Hacskaylo
cc97e567b6
[Frontend] Further style cleanups
...
#689
#740
Tweaked scrollbar thumb color;
Fixed color of icons in s-menu-btn
menus, particularly for Snow theme;
Removed commented code;
2016-03-16 15:17:08 -07:00
Charles Hacskaylo
53f03cddb7
[Frontend] Further cleanups to form elements
...
#689
Removed commented code;
2016-03-16 14:49:37 -07:00
Charles Hacskaylo
da1e6750a0
[Frontend] Removed reset.css and refs to modernizr
...
#700
Removed reset.css; Removed refs to
modernizr from licenses and readme.md;
2016-03-16 14:44:01 -07:00
Charles Hacskaylo
3258342783
[Frontend] Further cleanups to form elements
...
#700
#689
#740
Removed _selects.scss and moved classes
into _controls.scss;
Reorg'd _controls;
Moved classes into _elems.scss;
Added and fixed cssclass defs in multiple
bundle.js files to allow better field widths
in overlay dialogs;
Fixed overlay custom scrollbar colors;
Fixed alignment of required glyphs in forms;
2016-03-16 14:40:06 -07:00
Victor Woeltjen
73b7365ae2
[Tree] Don't assume context capability is present
...
Addresses #753 (newly-created objects may not have context,
causing errors when these are encountered by TreeNodeView)
2016-03-16 14:10:58 -07:00
Charles Hacskaylo
32a42bd679
[Frontend] CSS tweaks to fix required glyph positioning
...
#700
CSS modded to allow better cross-browser
positioning of 'required' form-row glyphs;
Other elem's CSS adjusted as a result;
2016-03-16 09:43:59 -07:00
Victor Woeltjen
324c2cac03
[Tree] Refresh properly on mutation
...
...by removing the incorrect expectation that a domain object
(and not just its model) will be passed in when mutation occurs.
Addresses #745 .
2016-03-15 12:23:46 -07:00
Victor Woeltjen
42ac657105
[Tree] Add status classes during editing
...
Addresses #749
2016-03-15 12:16:58 -07:00
Pete Richards
936079da92
Merge remote-tracking branch 'origin/tree-732'
2016-03-14 16:15:05 -07:00
Andrew Henry
4e89ffbe07
Merge pull request #735 from nasa/open729
...
Review and integrate open729
2016-03-14 16:12:18 -07:00
Charles Hacskaylo
bf3b964ad2
Removed commented code
...
#729
#735
2016-03-14 15:45:10 -07:00
Victor Woeltjen
55ae755522
[Tree] Fix error in test case
...
Correctly expect both arguments to $watch
2016-03-14 15:04:58 -07:00
Victor Woeltjen
d522570c0b
[Tree] Add spec for mct-tree
2016-03-14 14:54:57 -07:00
Victor Woeltjen
d72aaf54ca
[Tree] Test inner tree creation
2016-03-14 14:40:46 -07:00
Victor Woeltjen
8f94751a35
[Tree] Add capabilities to child objects for testing
2016-03-14 14:14:34 -07:00
Victor Woeltjen
8b51ae32d2
[Tree] Begin testing selection change
2016-03-14 13:04:46 -07:00
Victor Woeltjen
ecb37c54be
[Tree] Add TreeView test cases
2016-03-14 12:52:33 -07:00
Victor Woeltjen
43492d31ba
[Tree] Begin writing spec for TreeView
2016-03-14 12:22:09 -07:00
Victor Woeltjen
d789e91c18
[Tree] Add wait spinner
2016-03-11 18:00:58 -08:00
Victor Woeltjen
f7ba24c0b6
[Tree] Enable gestures on labels
2016-03-11 17:43:18 -08:00
Victor Woeltjen
02ec6db104
[Tree] Trigger digest on tree selection change
2016-03-11 17:37:11 -08:00
Victor Woeltjen
a3a9393d1b
[Tree] Change selection on click
2016-03-11 17:32:57 -08:00
Victor Woeltjen
217e697079
[Tree] Display selection state
2016-03-11 17:26:00 -08:00
Victor Woeltjen
82b6166408
[Tree] Begin wiring in selection
2016-03-11 17:09:17 -08:00
Victor Woeltjen
03ab3bddc4
[Tree] Begin handling selection state
2016-03-11 17:00:55 -08:00
Victor Woeltjen
4a8222a152
[Tree] Update labels on mutation
2016-03-11 14:47:50 -08:00
Victor Woeltjen
7ee8d0a3f7
[Tree] Display tree correctly
2016-03-11 14:40:04 -08:00
Victor Woeltjen
dc2b3e85cc
[Tree] Show tree with toggle
2016-03-11 14:33:05 -08:00
Victor Woeltjen
d4b15525ca
[Tree] Begin using mct-tree for tree representation
2016-03-11 14:23:08 -08:00
Victor Woeltjen
cbd9509260
[Tree] Use TreeView from mct-tree
2016-03-11 14:13:14 -08:00
Victor Woeltjen
c5ab6c6c97
[Tree] Implement label for tree
2016-03-11 14:10:30 -08:00
Andrew Henry
d39dea971f
Merge pull request #721 from nasa/open716
...
[Info Bubble] Fix bug with arrow positioning
2016-03-11 13:13:49 -08:00
Victor Woeltjen
4f293f22a6
[Tree] Add Zepto dependency
...
...to support implementation of a jQuery-less tree.
2016-03-11 12:38:40 -08:00
Victor Woeltjen
cebf9f73da
[Tree] Begin adding tree label
2016-03-11 12:29:24 -08:00
Victor Woeltjen
37e6b5a352
[Tree] Continue breaking apart tree view
2016-03-11 11:39:10 -08:00
Victor Woeltjen
ece8f7fded
[Tree] Begin separating out TreeView
2016-03-11 11:12:43 -08:00
Victor Woeltjen
3b0a3733b4
[Tree] Begin adding controller for refactored tree
2016-03-11 10:23:06 -08:00
Victor Woeltjen
baab0be5af
[Tree] Begin adding mct-tree directive
...
...to reduce watch counts associated with the tree;
#732 and #315
2016-03-11 10:04:33 -08:00
Charles Hacskaylo
377d533ec7
[Frontend] Fixed markup
...
open #718
Removed class from markup;
2016-03-10 18:11:10 -08: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
Charles Hacskaylo
4983d35ca6
[Frontend] Cleanups to Inspector config elements
...
open #729
Spacing tweaks; set PlotOptionsForm.js > Autoscale
to not use control-first layout;
Checked in snow theme;
2016-03-10 13:18:57 -08:00
Charles Hacskaylo
7171fd01e3
[Frontend] Cleanups to Inspector config elements
...
open #729
In-progress
Moved CSS def to be more globally applicable;
Simplified layout obj props location display;
2016-03-10 11:07:26 -08:00
Charles Hacskaylo
0957fbc6f9
[Frontend] Cleanups to Inspector config elements
...
open #729
In-progress
Moved reduced-min-width into _inspector.scss;
Removed <style> defs in markup files;
2016-03-10 10:50:00 -08:00
Charles Hacskaylo
bdbb045005
[Frontend] Cleanups to Inspector config elements
...
open #729
In-progress!
Markup and CSS mods continued;
Config params added to PlotOptionsForm.js to
allow control-first layout per form row;
Changed titles of Inspector parts;
2016-03-10 10:31:05 -08:00
Charles Hacskaylo
318df9878d
[Frontend] Cleanups to Inspector config elements
...
open #729
In-progress!
Markup and CSS modified to cleanup control layout
and styling in Plot and Table config options;
gulpfile.js modified to include SASS source line numbers
in rendered CSS;
2016-03-09 17:22:41 -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
5920533637
[Build] Don't appear to use new for side effects
2016-03-04 12:23:53 -08:00
Victor Woeltjen
4f85616632
[Build] Fix FullscreenAction spec
...
...to reflect acquisition of screenfull dependency via
AMD
2016-03-04 11:46:15 -08:00
Victor Woeltjen
a1a7b2b8ce
[Build] Remove unused variables
...
...to satisfy JSHint
2016-03-04 11:41:48 -08:00
Victor Woeltjen
6289fe333b
[Build] Declare screenfull
...
...and shim such that it can be acquired in the normal AMD way.
Avoids use of global variable to satisfy JSHint.
2016-03-04 11:05:08 -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
f6898d16c9
[Build] Remove obsolete argument
...
...which incidentally triggers JSHint errors
2016-03-04 10:56:51 -08:00
Victor Woeltjen
ac5ac8d34e
[Build] Remove boilerplate from scripts
...
No longer necessary after JSHint configuration.
2016-03-04 10:46:38 -08:00
Victor Woeltjen
f302bd6cb2
[Info Bubble] Test arrow class application
...
#716
2016-03-03 16:17:01 -08:00
Victor Woeltjen
071a908c10
[Info Bubble] Don't clobber arrow classes
...
#716
2016-03-03 15:58:28 -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
Henry
2cc2c6a9d3
[Edit Mode] #627 removed edit concerns from browse controllers and markup
...
Fixed elements not appearing in edit mode
Fixed failing tests
2016-03-02 11:05:23 -08:00
Henry
a910fa8f37
Removed unused 'controller as'
2016-03-02 11:01:34 -08:00
Henry
65ca78d8aa
Added missing dependency on
2016-03-02 11:00:08 -08:00
Henry
2f036a89e4
Refactoring out regions
2016-03-02 11:00:08 -08:00
Henry
fa46d31ac2
[Edit Mode] #627 slightly modified edit representer to detect newly created objects
...
Added some comments, renamed controller variable in markup
Removed edit references from BrowseController
2016-03-02 10:57:05 -08:00
Henry
549dfab5aa
[Edit Mode] #627 remove edit concerns from browse controller
2016-03-02 10:55:18 -08:00
Victor Woeltjen
494212a448
Merge pull request #653 from nasa/open499
...
[Notifications] #499 All notifications now dismissable by default.
2016-03-01 14:50:56 -08:00
Pete Richards
183bd9793c
Merge branch 'open677'
2016-03-01 11:33:31 -08:00
Pete Richards
96d9f8c194
[Templates] load plot templates with require
...
Load templates with requirejs.
https://github.com/nasa/openmctweb/issues/673
2016-03-01 10:52:07 -08:00
Pete Richards
748673f99b
Merge branch 'master' into open638_rebase
2016-03-01 10:48:53 -08:00
Pete Richards
78374f8241
Merge branch 'open401'
2016-03-01 10:37:12 -08:00
Pete Richards
bc6185f76d
[Browse] Remove unused constant
...
https://github.com/nasa/openmctweb/issues/401
2016-03-01 10:36:30 -08:00
Henry
747a98d130
Addressed issues from code review
2016-02-29 18:42:48 -08:00