Pete Richards
60d1b73160
Update tests and correct style
...
Update tests to reflect new functionality.
Closes https://github.com/nasa/openmct/issues/1360
2016-12-20 16:49:13 -08:00
Pete Richards
89be1c810a
[Browse] tighter tree view integration
...
BrowseController uses new MCTTreeView parameters to prevent navigation
events before triggering digests. It also no longer sets navigation
more frequently than it should.
https://github.com/nasa/openmct/issues/1360
2016-12-20 16:43:23 -08:00
Pete Richards
daa71c4f69
[Navigation] remove mct-before-unload
...
Remove mct-before-unload, and move the functionality to the navigation
service. The navigation service considers "unload" to be a navigation
event and prompts in much the same way as it would before any other
navigation event.
https://github.com/nasa/openmct/issues/1360
2016-12-20 16:43:23 -08:00
Pete Richards
f2d61604f7
[Navigation] navigationService provides checking
...
Remove policy checking in navigation action and depend on navigation
service to provide those checks.
* Register checkFunctions with navigationService.checkBeforeNavigation
which returns a function for unregistering them.
* navigationService.setNavigation will run checks before allowing
navigation, unless a `force` argument is supplied.
https://github.com/nasa/openmct/issues/1360
2016-12-20 16:43:23 -08:00
Pete Richards
0b79ec1235
[Browse] Simplify Edit Representation
...
Simplify edit registration and remove extra abstractions. No longer
attach a status listener for every representation-- just use a single watch
for the edit controller. Simplifies logic involved in switching controllers.
https://github.com/nasa/openmct/issues/1360
2016-12-20 16:43:23 -08:00
Henry
83ed4f6b0d
[Navigation] Fix errors appearing in console on initial navigation. Fixes #1351
2016-12-09 09:59:27 -08:00
Andrew Henry
45de84c183
[Time Conductor] Prevent route change when time conductor values change ( #1342 )
...
* [Time Conductor] Prevent route change on setting search parameters. fixes #1341
* [Inspector] Fixed incorrect listener deregistration which was causing errors on scope destruction
* Bare route is redirect to browse
* [Browse] handle routing without breaking $route
Manage route transitions such that route changes are properly
prevented and navigation events occur while still updating the url.
Resolves a number of issues where path and search updates had
to be supported in a very hacky manner.
https://github.com/nasa/openmct/pull/1342
* [URL] Set search without hacks
Changes in previous commit allow the search parameters to be modified
without accidentally triggering a page reload.
https://github.com/nasa/openmct/pull/1342
* [Views] Update on location changes
If the user has a bookmark or tries to change the current view of an
object by specifying view=someView as a search parameter, the change would
not previously take effect. This resolves that bug.
https://github.com/nasa/openmct/pull/1342
* [TC] Set query params to undefined
Instead of setting params to null, which would eventually result in those
parameters equaling undefined, set them to undefined to skip the extra
step.
https://github.com/nasa/openmct/pull/1342
* [Instantiate] Instantiate objects with context
Add context to instantiate objects so that they can be navigated
to for editing.
https://github.com/nasa/openmct/pull/1342
* [Tests] Update specs
Update specs to match new expectations.
* [Style] Fix style
* [TC] Remove unused dependency
Remove $route dependency from time conductor controller as it was
not being used. Resolves review comments.
https://github.com/nasa/openmct/pull/1342#pullrequestreview-11449260
2016-12-07 13:33:53 -08:00
Pete Richards
65043d0ff3
squash merge open933 into integration-1089, resolve merge conflicts.
2016-10-12 13:47:56 -07:00
Victor Woeltjen
a93f41f1c3
[API] Miscellaneous platform updates
...
Adds miscellaneous platform updates to include templates
via the RequireJS text plugin; to support modification of
asset paths; and to support priority order for gestures.
Supports integration of new API, #1124 .
2016-09-30 10:25:22 -07:00
Henry
98f387b605
[Edit Mode] Renamed function from EditAction.cancel() to EditAction.finish()
2016-09-22 17:34:53 -07:00
Henry
7a94efccbf
[Edit Mode] Fixed spelling mistake, moved variable declaration
2016-09-22 11:04:04 -07:00
Henry
3548cde9c4
[Edit Mode] Fixed issue with save dialog not being displayed for new objects after mutation. Fixes 1080
2016-09-21 16:12:09 -07:00
Victor Woeltjen
d1e1ba1c66
[Frontend] Refactor glyphs to classes
...
Squashes #1103 , fixes #1047 .
Squashed commit of the following:
commit 0e060f174dFixes #1047
commit 9f74395a79Fixes #1047
commit 7278c9534cFixes #1047
Fixed .s-status-editing and s-status-pending;
commit 4606d617d1d5bff5559436f7d5bff555e0Fixes #1047
commit b72d82baefFixes #1047
commit af36b9996dFixes #1047
<mct-form> must now include class
'validates' to display validation glyph icons;
removed 'no-validate' from markup; cleaned
up validation scss;
commit 69dc893b4bFixes #1047
Fixes and enhancements for mobile,
particularly in tree; Removed
`display: inline-block` from containerSubtle
mixin;
commit 7bca18b186Fixes #1047
.s-menu-btn > .s-menu-button;
.create-btn > .create-button;
removed unused l-btn, t-btn,
t-btns-zoom from markup
commit 5d229198b7Fixes #1047
commit 36479e2e8bFixes #1047
commit 89e4f06de9Fixes #1047
commit e65ca1cb8bFixes #1047
- Clock, timer, plots updated
commit 3e7eb98ac2Fixes #1047
- Finessing mini-tab and making able to
control per theme; s-clickable and s-toggle-icon
classes cleaned up
commit 18e08074a8Fixes #1047
- Splitter and mini-tab-icon elements
commit 44fda8d68fFixes #1047
mini-tabs, splitters and bg-splash updated;
moved position of Inspector collapse mini-tab
to allow position transition;
splitter-sm class added for Timelines;
commit 2aee8bc0d8Fixes #1047
commit 624f09777fce7591f4d2f159ce7591f642Fixes #1047
Restored no-collapse and float-right
properties;
commit 5324c8edbaFixes #1047
New font files that were missed in
last commit; updated icomoon proj
file; fixed missing char codes in
glyphs.scss;
commit a3b2628883Fixes #1047
New icons for overlay and stacked plots;
revised art and new description for
Fixed Position object;
commit 8a41c6dbc7Fixes #1047
Updated comment
commit eb293b21ebFixes #1047
Removed commented code
commit d8b1fb7781Fixes #1047
Search and removal of "glyph" definitions in bundle
and other JS files; updating tests accordingly;
commit 650fbcc921Fixes #1047
Search and removal of "glyph" definitions in bundle
and other JS files; updating tests accordingly;
commit 574b8bd5c1Fixes #1047
Fixing test cases
commit dd84177441Fixes #1047
WIP: Fixing test cases: fixed test in Timers that was expecting
glyph return;
commit 2231f8e124Fixes #1047
Fixing test cases: fixed test in Timers that was expecting
glyph return;
commit ae59ecfa97Fixes #1047
WIP: fixed line-height issue for t-item-icon class
commit d43bff1445Fixes #1047
WIP: fixed colors and style defs related to clickable
icons
commit c2db6f8805Fixes #1047
WIP: fixed colors related to changes to
btnSubtle mixin; new constants for clickable
icons
commit a4753c44d1Fixes #1047
WIP
commit 2704640b94Fixes #1047
Normalize color constant values for themes; consolidated
and cleaned up btn-related mixins; fixed hover color issues
commit 421286c7e4Fixes #1047
WIP
commit a4111f3855Fixes #1047
WIP: Timeline-related glyph refactoring; s-btn
styles and hover color fixes
commit 883f9992159d9cabb14f1a1f9d9cabb760Fixes #1047
WIP: search, toolbar buttons; mods
to flex archetypes
commit 28b663ce41Fixes #1047
Glyph refactoring WIP for toolbar buttons;
Timeline glyph refactoring continued
commit a9326f572fFixes #1047
Timeline glyph refactoring; Resource Graph icons
in swimlanes now display grayed-out version when not
added to the Resource Graph; minor color tweaks
commit d6e173780388054e56176ca2Fixes #1047
Resolved conflict in icomoon.json file
commit 88054e5e8efixes #1047
In progress: significant mods to pane collapse/expand
buttons and symbols, minor tweaks to splitter look,
limits glyph definitions
commit 7c47343f5cfixes #1047
In progress: updated font files glyphs, mostly
for pane collapse icons
commit fd00bdce54fixes #1047
In progress: search menu
commit 272b4b649efixes #1047
In progress: moved limits classes out
of _contants and into _glyphs;
timers, entanglement context menu items,
form validation, date picker.
commit 95d26e6fe7Fixes #1047
In-progress; limits
commit 26b30d96dbFixes #1047
In-progress; overlay close, search inputs,
messages and message banners,
ui-symbol removal in-progress.
commit 4e2a01ad85Fixes #1047
In-progress; .labeled added to .s-btn,
removed .s-icon-btn
commit 521db3c3feFixes #1047
In-progress; plot options, imagery buttons,
cleanups in buttons.scss, edit-action buttons,
.s-btn .no-label class added.
commit 8bb8db69e6Fixes #1047
In-progress; indicators, notifications, actions,
tests
commit 53ed0bfb22fixes #1047
In progress, really: view icons, timer/clock
commit 47dc7f2f6bfixes #1047
In progress: grid items
commit 2bd34f71befixes #1047
Context menus and associated actions,
custom checkboxes, tree item being edited
commit b561d4f60efixes #1047
In-progess: glyphs.scss now uses $vars to
allow other scss to use a var instead of string
literals;
commit 0cf4089620fixes #1047
In-progess: tree-labels, unknown objects, object
header
commit 46cae10905fixes #1047
In-progess, menus and Create menu fixes
commit fe3097707f7d69ae4652a50c7d69ae401bfixes #1047
In-progress, converting types, mods to
Create Menu template
commit 18d9f3d6b2fixes #1047
Very much In-progess: convert some controls;
commit e93a90a782fixes #1047
Very much In-progess, classes for all symbols
added to glyphs.scss; .menu cleaned up;
commit dc670b22a6fixes #1047
Very much In-progess, "icon-" selector,
browse bar buttons
commit 8b29ccf3affixes #1047
Very much In-progess, s-btn and
s-btn-menu refactoring
commit f574ffed16fixes #1047
In-progess, e900 > e904
commit bc62ee4565fixes #1047
New font files; no re-mapping yet in the app.
commit 614f0c6e9ffixes #1047
Moved all glyphs into PUA area of font, and
re-organized by category.
commit 47bd4031d5Fixes #1047
- Modified sass to point to renamed font files;
- Added new 12px symbols font files to sass;
commit 22a51d6bbbFixes #1047
- Renamed main project file;
- Added new 12px symbols project file;
commit 13ded2fd84Fixes #1047
commit aef5660dfdFixes #1047
2016-08-01 14:33:25 -07:00
Pete Richards
14f1a1f740
Merge remote-tracking branch 'origin/open1031'
2016-07-18 11:43:55 -07:00
Henry
c8898ac6aa
[Documentation] Updated copyright statement. Fixes #1081
2016-07-12 16:55:57 -07:00
Henry
c0311be192
[Browse] Inspector shown when object switched to edit mode. Fixes #1031
2016-06-20 20:27:56 -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
Victor Woeltjen
56ff98cce7
Merge branch 'master' into orphan-navigation-765
2016-05-26 12:35:48 -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
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
ad5691142e
[Code Style] Rename shadowing variables
2016-05-20 13:05:32 -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
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
bd686790dc
Resolved merge conflicts
2016-05-12 16:03:19 -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
Victor Woeltjen
8f4f0cb78e
Merge pull request #785 from nasa/open677_cleanup
...
[Timelines] #677 Removed temporary markup
2016-04-05 12:24:58 -07:00
Henry
650ef9bfa4
[Timelines] #677 Removed temporary markup
2016-03-23 11:27:40 -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
Andrew Henry
4e89ffbe07
Merge pull request #735 from nasa/open729
...
Review and integrate open729
2016-03-14 16:12:18 -07:00
Charles Hacskaylo
377d533ec7
[Frontend] Fixed markup
...
open #718
Removed class from markup;
2016-03-10 18:11:10 -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
Victor Woeltjen
d6ec7e9ab8
[Build] Remove unused variables from specs
...
...to satisfy JSHint.
2016-03-04 12:56:14 -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
ac5ac8d34e
[Build] Remove boilerplate from scripts
...
No longer necessary after JSHint configuration.
2016-03-04 10:46:38 -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
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
Pete Richards
183bd9793c
Merge branch 'open677'
2016-03-01 11:33:31 -08:00
