Andrew Henry
f7ff5af60b
Merge pull request #1448 from nasa/update-composition-policy
...
Update composition policy
2017-02-21 17:18:59 -08:00
Pete Richards
2a10a2cae2
Update specs to match composition policies
2017-02-21 15:14:35 -08:00
Pete Richards
65325b90fd
Composition policy takes child instance
...
The composition policy now takes a child instance instead
of the child type, as in all cases we have access to the child
object.
This allows new-style objects to be contained by old-style objects.
Updated all composition policies to use standardized argument names
instead of `context` and `candidate`; this makes it easier to
understand.
Updated AddActionProvider to hardcode the object types supported.
2017-02-21 12:32:49 -08:00
Pete Richards
aaedf5d576
cssclass is now cssClass
...
Make property name consistent with standard camelCase naming.
2017-02-21 11:14:46 -08:00
Pete Richards
5b6f95bd4a
[Fixed] Specify default layout grid ( #1296 )
...
* [Fixed] Specify default layout grid
Previously users would see blank values for grid size
even though a default was applied. Users will now
see default values for grid size which should prevent
them from accidentally changing grid size.
Fixes https://github.com/nasa/openmct/issues/1285
* [Fixed] Don't hardcode grid size
Remove hardcoded grid size per comments.
https://github.com/nasa/openmct/pull/1296#issuecomment-259231499
* [Fixed] read layout before initial refresh
Read the layoutGrid sizes from scope (when watch is registered)
before refreshing elements, to ensure that layoutGrid is set
properly.
https://github.com/nasa/openmct/pull/1296#issuecomment-259231499
* [Spec] Update spec to match
Update spec to trigger watch on initialization to ensure
layoutGrid is set.
https://github.com/nasa/openmct/pull/1296
2016-11-08 14:59:09 -08:00
Pete Richards
65043d0ff3
squash merge open933 into integration-1089, resolve merge conflicts.
2016-10-12 13:47:56 -07:00
steven mirecki
e751461194
Typo corrections, I avoided making changes to words that have regional spelling differences.
2016-09-03 09:16:54 -04:00
Charles Hacskaylo
ee917b0e1d
[Frontend] Initial styling for selectable styling
...
Fixes #1161
New .s-selectable, .s-hover, .s-selected and .s-moveable classes
New supporting color constants
Markup in layouts, fixed position/panels updated
Removed old commented code
2016-09-01 10:55:07 -07:00
Charles Hacskaylo
1a284ac9dc
[Frontend] Proper classes added to text input configs
...
Fixes #1108
2016-08-29 14:14:51 -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
Henry
c8898ac6aa
[Documentation] Updated copyright statement. Fixes #1081
2016-07-12 16:55:57 -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
fa77139077
[Code Style] Run gulp fixstyle
...
...to apply code style settings from #142 .
2016-05-19 11:29:13 -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
Charles Hacskaylo
88784d37fd
[Frontend] Added priority
...
#787
2016-03-24 12:05:10 -07:00
Charles Hacskaylo
594f3b8ec2
[Frontend] Corrected wrong unicode value
...
#781
2016-03-23 19:30:20 -07:00
Charles Hacskaylo
b08d00ef3e
[Frontend] Removed tab character
...
#781
2016-03-23 19:25:25 -07:00
Charles Hacskaylo
7da1a4b2a3
[Frontend] Updated glyph defs and descriptions
...
#781
#187
Converted many glyph char defs to
their JSON unicode equivalents;
Updated descriptions for many domain
objects;
2016-03-23 19:04:32 -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
d6ec7e9ab8
[Build] Remove unused variables from specs
...
...to satisfy JSHint.
2016-03-04 12:56:14 -08:00
Victor Woeltjen
a1a7b2b8ce
[Build] Remove unused variables
...
...to satisfy JSHint
2016-03-04 11:41:48 -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
3a6e0be2d7
[Templates] Update FixedController spec
...
...to reflect changes to how selection object is obtained,
which in turn reflects change to using templates obtained
via RequireJS text plugin, instead of loading by URL.
2016-02-26 16:19:14 -08:00
Victor Woeltjen
931fa77cbe
[Templates] Handle deferred selection availability
...
Loading templates via RequireJS text plugin means they are
immediately available; appears to have caused a change in
ordering wherein controllers for views may be initialized
before representers have installed things like selection
state. As such, need to watch for changes instead of simply
checking for a selection object when the controller is
initialized.
2016-02-26 15:37:19 -08:00
Victor Woeltjen
bf1fa0ac4c
[Templates] Include templates using text plugin
...
Resolves #673
2016-02-26 13:07:50 -08:00
Victor Woeltjen
aebae27391
[Tests] Remove suite.json files
...
Remove obsolete suite.json files; #482
2016-02-02 09:35:50 -08:00
Henry
032b2542f0
Merged from Master
2016-01-14 17:23:53 -08:00
Henry
3e7eb11d84
Regenerated bundles
2016-01-14 17:08:19 -08:00
Henry
826d39a749
[New Edit Mode] Fixed logic in EditActionPolicy to use positive logic
2016-01-14 15:02:22 -08:00
Charles Hacskaylo
4f7ca98b60
Merge branch 'master' into nem468a.
...
Many tweaks to fix some issues with tree, labels and Inspector.
Conflicts:
platform/commonUI/edit/res/templates/elements.html
platform/commonUI/general/res/sass/search/_search.scss
platform/commonUI/general/res/sass/tree/_tree.scss
platform/commonUI/general/res/templates/object-inspector.html
platform/commonUI/themes/espresso/res/css/theme-espresso.css
platform/commonUI/themes/snow/res/css/theme-snow.css
platform/search/res/templates/search.html
2016-01-11 13:29:26 -08:00
Victor Woeltjen
0036974c60
Merge remote-tracking branch 'github/master' into open450b
...
Merge latest from master branch to reconcile conflicts
for https://github.com/nasa/openmctweb/pull/469
Conflicts:
platform/commonUI/general/bundle.json
2016-01-08 15:36:10 -08:00
Victor Woeltjen
cec197f888
[API Refactor] Remove bundle.json files
2016-01-08 15:32:18 -08:00
Victor Woeltjen
de53247d56
[API] Convert JSON bundles to imperative form
2016-01-07 15:08:08 -08:00
Victor Woeltjen
a49deb5ab1
Merge remote-tracking branch 'github/master' into open116
...
Merge in latest from master into topic branch for
https://github.com/nasa/openmctweb/issues/116
Conflicts:
platform/features/layout/test/FixedControllerSpec.js
platform/features/plot/test/PlotControllerSpec.js
2015-12-30 10:15:05 -08:00
Victor Woeltjen
9b63a63efc
Merge pull request #379 from nasa/open1337
...
[Limits] Add test cases for limits
2015-12-30 10:11:27 -08:00
Victor Woeltjen
c436bcce0a
[Time Conductor] Test updated fixed position behavior
...
Verify interactions from FixedControllers on events
issued by the time conductor.
2015-12-30 09:29:24 -08:00
Henry
cf73f3a0c4
Moved gesture from individual views up to browse-object.html for now to resolve #423
2015-12-11 16:42:05 -08:00
Henry
49579378dd
[New Edit Mode] Fixed positioning of dropped objects #386
2015-12-09 09:51:00 -08:00
Henry
b5c741c911
Merge branch 'master' into open199
2015-12-08 15:42:37 -08:00
Victor Woeltjen
038322e9aa
[Layout] Update raw positions on drop
...
When handling a drop into the layout, store the panel's
new position to the LayoutController's internal table of
raw positions (in addition to writing it to the configuration.)
Avoids https://github.com/nasa/openmctweb/issues/384
2015-12-08 15:08:30 -08:00
Henry
18607e9404
Merged from Master
2015-12-07 20:42:09 -08:00
Victor Woeltjen
33c372765f
[Limits] Test limit usage from Fixed Position
...
WTD-1337
2015-12-07 12:33:29 -08:00
Henry
6fb6f54cfa
Fixed objects being dropped twice in fixed layout
2015-11-27 15:21:24 -08:00
Henry
db7224486c
[Layout] Layout rebuilds after resize/reposition - Fixed potential race condition #32
2015-11-25 19:11:29 -08:00
Henry
6d0f3c7faa
[Layout] Layout rebuilds after resize/reposition #32
...
Refactored layoutPanels method
Fixed JSLint errors
fixed failing tests
2015-11-25 15:30:33 -08:00
Henry
988323bdbd
merged Open32
2015-11-25 14:59:47 -08:00
Henry
c84de00e80
[Layout] Layout rebuilds after resize/reposition #32
2015-11-24 21:51:10 -08:00
Henry
b27b60aedc
Merge branch 'master' into open199
2015-11-17 14:30:57 -08:00
akhenry
b7eb9491cb
Merge pull request #275 from nasa/open271
...
[Layout] Enforce minimum size on drop
2015-11-12 16:10:50 -08:00
Charles Hacskaylo
608df8f7b8
Merging in latest github master; resolved conflicts
2015-11-10 16:13:46 -08:00
