ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-01 10:56:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,192 Commits 989 Branches 212 Tags 191 MiB
06779e6cd9
Commit Graph

280 Commits

Author SHA1 Message Date
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
Victor Woeltjen
fdf6148811 [Layout] Enforce minimum size on drop 
Addresses nasa/openmctweb#271, ensuring frames in a layout
are not too tiny to use, even if the grid size is small.
 2015-11-09 17:58:20 -08:00
Charles Hacskaylo
4e79de6156 [Frontend] Apply flex layout to object header elements 
open #250
open #260
vista#132
Major refactoring to markup and CSS to apply
flex layout strategy to object headers;
Flex necessary to fix 'overflow: hidden' setting
applied in open90 to object-browse-bar that
was preventing the view switcher menu from
appearing;
Browse, edit, mobile, frames in layouts, etc. all
visually checked in a first go round;
Mobile classes tweaked to fix left and right
margin problems resulting from open90 changes;
z-indexing of Inspector pane and splitters changed
to allow primary pane elements to overflow beneath
when primary pane width is severely constrained;
 2015-11-06 17:42:54 -08:00
Andrew Henry
92573b817f Added drag to enable edit mode 2015-10-20 21:03:36 -07:00
Victor Woeltjen
1efa97e6f5 Merge remote-tracking branch 'github/master' into open115b 
Conflicts:
	platform/features/conductor/src/ConductorRepresenter.js
 2015-10-09 10:32:43 -07:00
Charles Hacskaylo
333f7cb848 [Frontend] Time controller-related styling 
open #1515
open #117
Markup changed to utilize mct-representation via CSS;
time-controller now uses list-based _constants values;
ConductorRepresenter.js modded to remove inline styling
and to add CSS classes to enclosing mct-representation;
 2015-09-29 08:43:34 -07:00
Victor Woeltjen
4ced6c44a6 [Time Conductor] Ignore empty series 
...when updating Fixed Position view.
 2015-09-24 17:01:50 -07:00
Victor Woeltjen
0260e6fff4 Merge branch 'open1515' into open115 2015-09-23 16:05:09 -07:00
Charles Hacskaylo
9811443c71 Merge branch 'master' into open117 2015-09-23 15:54:48 -07:00
Victor Woeltjen
056b0c8c5b [Fixed Position] Use spaces instead of tabs 
...to satisfy code style checker and pass build,
in preparation for merge. nasa/openmctweb#118
 2015-09-23 12:59:04 -07:00
Victor Woeltjen
dbe1875e70 [Themes] Resolve conflicts 
Resolve conflicts in preparation for merge, nasa/openmctweb#118
 2015-09-22 16:12:44 -07:00
Pete Richards
480da3476e Merge branch 'mobile' into mobile-integration 2015-09-22 10:55:43 -07:00
Charles Hacskaylo
65368ed0c3 [Config] Removed non-functional config options from Create dialogs; 
open #124
Removed "Default view" and "Display title by default" from
Panel configs;
 2015-09-18 13:43:29 -07:00
Charles Hacskaylo
f28d2f19d0 [Frontend/PLATFORM] Cherry picking from platform changes in vista65 
open #95
vista #65
scss and html mods for VISTA-related elements;
(cherry picked from commit 6ef3987)
 2015-09-16 17:17:54 -07:00
Victor Woeltjen
190f5fd0ea [Time Conductor] Update failing specs 
WTD-1515
 2015-09-16 15:23:08 -07:00
Victor Woeltjen
ad29fb0f92 [Time Conductor] Populate FP from historical 
Populate fixed position view from historical
telemetry when first loaded. WTD-1515
 2015-09-16 13:38:47 -07:00
Charles Hacskaylo
3e5d46a62b [Frontend] IN-PROGRESS Theme changes continuing 
open #95
Limits, plots, etc.;
Misc sanding and shimming;
Updated  symbols font to replace missing
Info symbol;
 2015-09-11 16:25:19 -07:00
Victor Woeltjen
e3b191b5dc [Time Controller] Update failing specs 
Update failing specs to reflect support for time conductor,
WTD-1515
 2015-09-09 16:52:46 -07:00
Victor Woeltjen
a4dda695dd [Time Controller] Get conductor working with fixed pos. 
WTD-1515
 2015-09-09 16:46:00 -07:00
Victor Woeltjen
fdbc91131b [Time Controller] Update bundle definition 
...for Fixed Position view to reflect changes to dependencies,
WTD-1515.
 2015-09-08 17:18:39 -07:00
Victor Woeltjen
d2dfec3ce7 [Time Controller] Simplify retrieval of datum objects 
...for historical data. Supports WTD-1515
 2015-09-08 17:03:58 -07:00
Victor Woeltjen
760f4b818f [Time Conductor] Update fixed position from history 
WTD-1515
 2015-09-08 16:53:06 -07:00
Victor Woeltjen
c026bfa17d [Time Conductor] Begin adding support to fixed position 
Begin adding support for universal time controller to
fixed position view, WTD-1515.
 2015-09-08 16:37:10 -07:00
Charles Hacskaylo
bb1a02c8bd [Frontend] Significant re-factoring of CSS and markup 
open #95
IN-PROGRESS!;
Mostly buttons and menus classes (s-btn and s-menu);
Removed unused templates and .css files;
Normalized some button containers;
 2015-09-02 18:02:58 -07:00
Shivam Dave
def5e17bb8 [Mobile] Merge 
Merged open73 into mobile. Search bar is currently
covering the create button slightly.
 2015-08-26 14:07:52 -07:00
Charles Hacskaylo
e96d3e3738 [Mobile] IN PROGRESS: Significant redo of object-header 
open #74
Added .bar .l-flex using display: flex in object header;
 2015-08-24 12:22:08 -07:00
Charles Hacskaylo
ee608cc4a4 [Mobile] IN PROGRESS: General fixes, spurred by mobile, for object-header 
open #74
Attempting to layout using flex - not working;
See http://jsfiddle.net/charlesh88/cpf9zjts/9/ for working example;
New _flex.scss added;
This commit is changed elements that are mostly solid;
 2015-08-21 15:09:23 -07:00
Victor Woeltjen
ed53808556 [Code Style] Use prototypes in Layout bundle 
WTD-1482
 2015-08-12 13:45:48 -07:00
Victor Woeltjen
31eb366e7f [JSDoc] Add namespace docs 
WTD-1482.
 2015-08-07 12:13:15 -07:00
Victor Woeltjen
c08a460d30 [JSDoc] Add annotations 
Bulk-add JSDoc annotations, WTD-1482.
 2015-08-07 11:44:54 -07:00
Victor Woeltjen
2ca3c6ea93 [Layout] Use consistent whitespace 
Use consistent whitespace in array literals, WTD-1424.
 2015-08-04 10:00:44 -07:00
Victor Woeltjen
a4c704a5a2 [Layout] Ensure minimum frame size 
Ensure default frame size in a layout is not small,
even if the grid size for the layout is very small.
WTD-1424.
 2015-08-03 12:18:49 -07:00
Charles Hacskaylo
af2ca49b23 [Frontend] Added top right resize corner 
WTD-1404
WTD-1376
 2015-06-30 09:27:56 -07:00
Victor Woeltjen
87f982b03e Merge remote-tracking branch 'nasa/open-master' into open-master 2015-06-29 15:10:02 -07:00
Victor Woeltjen
29283e4fb5 Merge branch 'open1233' into open-master 2015-06-29 15:09:40 -07:00
larkin
cc64412d78 Merge remote-tracking branch 'origin/open1344' into open-1348 2015-06-29 14:58:27 -07:00
Victor Woeltjen
ebbac233aa Merge branch 'open1373' into open-master 2015-06-29 13:15:43 -07:00
larkin
38ad8058e8 Merge remote-tracking branch 'origin/open1223' into open-1338 
Resolve merge conflicts due to whitespace changes.
 2015-06-29 12:08:16 -07:00
larkin
84345caf7d [Style] Convert tabs to spaces 2015-06-29 11:51:28 -07:00
Victor Woeltjen
762f4d59fc [Layout] Disallow folders 
Disallow layouts in folders, WTD-1373.
 2015-06-27 12:43:32 -07:00
Victor Woeltjen
286ac5628b [Drag-Drop] Check for default prevented correctly 
Check for defaultPrevented property instead of trying
to check nonexistent method isDefaultPrevented(); for
WTD-1354 in the context of WTD-1233.
 2015-06-26 11:53:45 -07:00
Victor Woeltjen
f681d07643 Merge branch 'open-master' into open1233 2015-06-26 11:50:48 -07:00
Charles Hacskaylo
685e384858 [Dev/Frontend] PLATFORM CHANGES: use data-value instead of css class selection 
WTD-1341
(cherry picked from commit 5151637 in warp1341)
telemetry.html now uses data-value instead of class;
Mods to effects.scss to add customKeyframes mixin;
Added default transition time to mixin trans-prop-nice in mixins.scss;
 2015-06-25 11:46:15 -07:00
Victor Woeltjen
61fe77cc17 [Drag-Drop] Add test cases 
Add test cases for avoiding redundant drop handling,
WTD-1233.
 2015-06-25 11:35:18 -07:00
Victor Woeltjen
6f3d6ec12f [Drag-Drop] Prevent redundant drops 
Mark default as prevented and check for prevention of
default when handling mctDrop events (which allow
views to follow up on drop gestures by positioning
objects within themselves) avoiding redundant drops
into embedded views. WTD-1233.
 2015-06-25 11:27:58 -07:00
Victor Woeltjen
482f355a08 [Fixed Controller] Stop tracking bounds 
Stop tracking size of a fixed position view; no longer
necessary now that background grid is handled by CSS.
Change made in the context of WTD-1344.
 2015-06-25 11:00:15 -07:00
Victor Woeltjen
9e55befb2a [Fixed Controller] Add test cases 
Add test cases for updating position of elements in
a fixed position view, WTD-1344.
 2015-06-25 10:58:01 -07:00
Victor Woeltjen
4279c9e4bf [Fixed Position] Remove obsolete cell styles 
Remove obsolete cell style calculations; background
grid is handled by CSS now. Changed in the context of
WTD-1344.
 2015-06-25 10:48:49 -07:00
Victor Woeltjen
791504584d [Fixed Position] Update positions when grid size changes 
Update positions of elements in a fixed position
view when grid size changes (e.g. when switching
from one domain object to another.) WTD-1344.
 2015-06-25 10:45:50 -07:00
Charles Hacskaylo
52a7bd1033 [Dev/Frontend] Cherry-picking platform changes from warp1341 
WTD-1341
 2015-06-24 18:55:15 -07:00
Victor Woeltjen
065a5a6fbf [Limits] Disable failing specs 
Disable specs which are failing after changes to support
limits, WTD-1223.
 2015-06-23 13:43:00 -07:00
Victor Woeltjen
a4ea0dd047 Merge branch 'open-master' into open1223 
Merge latest from master branch into topic branch for
WTD-1223
 2015-06-23 13:29:47 -07:00
Victor Woeltjen
3b62add011 Merge branch 'open-master' into open1223 
Conflicts:
	platform/features/plot/res/templates/plot.html
 2015-06-19 13:34:21 -07:00
Victor Woeltjen
b879de1a33 Merge branch 'open-master' into open1182 2015-06-19 12:22:05 -07:00
Victor Woeltjen
8d80a2aee1 Merge branch 'open-master' into open1182 2015-06-18 18:23:19 -07:00
Charles Hacskaylo
70e1a8ad9e [Frontend] Mods to layout element drag handles and editing behavior 
WTD-951
layout.html:
Added classes to and removed inline styles from drag handles,
Removed edge handles, leaving corner handles in NW, SW and SE only;
Added hover classes to display corner handles while editing;
Modified z-indexing to allow view switcher to be accessed while editing;
 2015-06-16 12:40:48 -07:00
Charles Hacskaylo
a984e60ca5 [Frontend] Mods to layout element editing handles 
WTD-951
In-progress checkin
 2015-06-16 10:48:31 -07:00
Victor Woeltjen
de3c6e4543 [Fixed Position] Show limits in fixed position 
Show limits in fixed position view, WTD-1223.
 2015-06-09 10:18:28 -07:00
Victor Woeltjen
9a3ccc3295 [Limits] Merge in latest from platform 
Merge in latest changes to platform to begin implementing
limits, WTD-1223.
 2015-06-05 16:28:29 -07:00
Victor Woeltjen
a18a7c9960 [Layout] Fix comment 
Change inaccurate comment based on feedback from code
review for WTD-1182.
 2015-06-03 07:49:11 -07:00
Victor Woeltjen
9b6d8cf1ec [Representation] Minimize scope reuse 
When switching among domain objects and/or views, avoid
reusing the same information is scope. The wrong information
in scope can cause various failures in views, such as WTD-1182.
 2015-05-20 16:26:53 -07:00
Victor Woeltjen
f74199e60f [Layout] Add check to view in frame 
Add check to template for views in frame to avoid populating
frame prematurely; WTD-1182.
 2015-05-20 14:02:56 -07:00