alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
673 Commits 965 Branches 192 Tags
c2d7996785c1a2b29afa2ea46af0490783e859f5
Commit Graph

71 Commits

Author SHA1 Message Date
Victor Woeltjen
5ab2ceb333 Merge branch 'open940b' into open929 
Merge in Fixed Position updates to reconcile conflicts
related to generalization of selection mechanism, WTD-929.

Conflicts:
	platform/features/layout/src/FixedController.js
	platform/features/layout/test/FixedControllerSpec.js
 2015-03-04 15:09:46 -08:00
Victor Woeltjen
93debb4abe Merge branch 'open-master' into open940b 
Merge in latest from open-master into topic branch for
WTD-940, merge of fixed position look-and-feel updates.

Conflicts:
	platform/features/layout/src/FixedController.js
	platform/features/layout/src/elements/ElementFactory.js
 2015-03-04 14:52:01 -08:00
Charles Hacskaylo
679e56d231 [Frontend] Tweaks and minor mods 
WTD-894
Changed image CSS from contain to cover
Modded default colors for text and telemetry elements to visibility;
Moved click handler position in menu-button.html for better clickability;

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
 2015-03-04 14:45:24 -08:00
Victor Woeltjen
3ce1064c4e [Fixed Position] Expose view proxy 
Expose view proxy as selection state from the Fixed Position
controller, to make Add button available under generalized
selection mechanism, WTD-929.
 2015-03-03 18:52:13 -08:00
Victor Woeltjen
6364296967 [Fixed Position] Remove obsolete script 
Remove obsolete script for selection management in
Fixed Position view; this has been generalized to
become part of Edit mode. WTD-929.
 2015-03-03 18:48:53 -08:00
Victor Woeltjen
ea37c636ee [Fixed Position] Use updated selection mechanism 
Use updated, more general approach to handling selections.
WTD-929.
 2015-03-03 18:35:28 -08:00
Charles Hacskaylo
7d03bc4de9 [Frontend] In-progress checkin: migrating style tags to classes, other 
WTD-894
Significant migration of inline styles to CSS classes;
Changed telemetry component so that when title is hidden, telem element can take up 100% of the element width;
Static text elements now show scrollbars on overflow;
Added padding and box-sizing to text elements - this is throwing off the selected control because of the offset and should be fixed;
 2015-02-25 15:53:02 -08:00
Victor Woeltjen
07fc65ed5b [Fixed Position] Remove old elements 
Remove elements from view configuration after they have been
removed from composition, WTD-883.
 2015-02-24 14:32:39 -08:00
Victor Woeltjen
6d709a6851 [Fixed Position] Ensure default positions 
Ensure all elements in a fixed position view's composition
are shown in view, WTD-883.
 2015-02-24 14:15:58 -08:00
Victor Woeltjen
6efccc0784 [Fixed Position] Add handles for line end points 
Add handles for moving line end points in fixed position view,
WTD-882.
 2015-02-24 11:48:46 -08:00
Victor Woeltjen
11360ba46c [Fixed Position] Add comments 
Add in-line documentation for WTD-882.
 2015-02-24 11:40:11 -08:00
Victor Woeltjen
5ba58ef056 [Fixed Position] Keep elements in view 
Prevent elements from being positioned at negative x/y
locations in a fixed position view, WTD-882.
 2015-02-24 11:38:46 -08:00
Victor Woeltjen
e56bac777e [Fixed Position] Use FixedDragHandle for moves 
Use FixedDragHandle to deal with repositioning, WTD-882.
 2015-02-24 11:29:52 -08:00
Victor Woeltjen
c306865d87 [Fixed Position] Update style during resize 
Update element style during resize, WTD-882.
 2015-02-24 11:22:52 -08:00
Victor Woeltjen
5e3d5fd00f [Fixed Position] Initially implement handles 
Initially implement handles for resizing elements in a fixed
position view, WTD-882.
 2015-02-24 11:00:36 -08:00
Victor Woeltjen
abad8df135 [Fixed Position] Begin updating controller 
Begin updating controller to expose handles for dragging,
resizing elements in fixed position view. WTD-882.
 2015-02-24 10:33:36 -08:00
Victor Woeltjen
3d86871c1d [Fixed Position] Cache name/value 
Cache name/value for telemetry elements to avoid flashing
after drag gestures, WTD-881.
 2015-02-24 09:25:14 -08:00
Victor Woeltjen
41a013d198 [Fixed Position] Add button to show/hide telemetry name 
Add button to show/hide name of telemetry elements in
fixed position view, WTD-881.
 2015-02-23 19:25:33 -08:00
Victor Woeltjen
1c69d1f2da [Fixed Position] Add text, image properties 
Add buttons for text, image properties to the Fixed Position
toolbar, WTD-881.
 2015-02-23 19:16:09 -08:00
Victor Woeltjen
0b2cd52433 [Fixed Position] Add image proxy 
Add selection proxy for image elements to support image URL
dialog, WTD-881.
 2015-02-23 18:28:30 -08:00
Victor Woeltjen
894a5b8f89 [Fixed Position] Add text color property 
Add a property to the Fixed Position toolbar to set text
color, WTD-881.
 2015-02-23 18:17:24 -08:00
Victor Woeltjen
13793e221e [Fixed Position] Add stroke property 
Add stroke property to Fixed Position toolbar for
borders, line color. WTD-881.
 2015-02-23 18:05:37 -08:00
Victor Woeltjen
46c8a456b7 [Fixed Position] Begin adding color chooser 
Begin adding choice of fill colors for box/text/telemetry
elements in a fixed position view, WTD-881.
 2015-02-23 14:52:19 -08:00
Victor Woeltjen
182d02599d [Fixed Position] Add fill properties 
Add 'fill' properties, to allow specifying background
color in Fixed Position view. WTD-881.
 2015-02-23 10:48:44 -08:00
Victor Woeltjen
53aabd5743 [Fixed Position] Add ordering control 
Add order control for elements in a fixed position view,
WTD-881.
 2015-02-23 10:33:27 -08:00
Victor Woeltjen
a2295e8416 [Fixed Position] Add JSDoc 
Add clarifying comments to different elements proxies, WTD-880.
 2015-02-20 16:26:10 -08:00
Victor Woeltjen
84e90f6ad1 [Fixed Position] Select newly-created elements 
When elements are added to a fixed position view, select them
immediately. WTD-880.
 2015-02-20 15:47:07 -08:00
Victor Woeltjen
f9043fdb7d [Fixed Position] Allow straight lines 
Pad width/height to give enough space to draw straight
lines; fix usage of background for boxes. WTD-880.
 2015-02-20 15:25:27 -08:00
Victor Woeltjen
2c0180ebda [Fixed Position] Draw line as SVG 
Draw line elements as SVG, WTD-880.
 2015-02-20 15:06:33 -08:00
Victor Woeltjen
638a7c8609 [Fixed Position] Add dialog for text 
Add dialog for text elements in fixed position view;
tweak styling on some other element types. WTD-880.
 2015-02-20 12:57:15 -08:00
Victor Woeltjen
f5b6be9b5d [Fixed Position] Add Image Properties dialog 
Add Image Properties dialog, for when a new image element
is created. WTD-880.
 2015-02-20 12:28:52 -08:00
Victor Woeltjen
a947ff1274 [Fixed Position] Add element factory 
Add element factory, which will take on responsibility
for populating initial states of elements and (if necessary)
prompting for user input. WTD-880.
 2015-02-20 12:21:28 -08:00
Victor Woeltjen
f1a8e84a93 [Fixed Position] Allow adding elements 
Allow adding of elements (without any element-specific
properties beyond type.) WTD-880.
 2015-02-20 11:53:50 -08:00
Victor Woeltjen
1015e97b3e [Fixed Position] Add tests for FixedController 
Add additional test cases for controller for Fixed Position
view to meet code coverage after changes for WTD-879.
 2015-02-19 16:24:45 -08:00
Victor Woeltjen
7882dd1401 [Fixed Position] Add spec for selection 
Add spec for selection manager for layout and fixed position
views, WTD-879.
 2015-02-19 13:06:55 -08:00
Victor Woeltjen
14cbb9fb40 [Fixed Position] Add placeholder specs 
Add placeholder specs for classes added to support
selection of elements in a fixed position view,
WTD-879.
 2015-02-19 12:21:39 -08:00
Victor Woeltjen
7498e340d6 [Fixed Position] Rename accessor 
Rename utility function used by fixed position elements
to be more accurate. WTD-879.
 2015-02-19 12:10:43 -08:00
Victor Woeltjen
83872946bf [Fixed Position] Fix grid size spec 
Fix spec which ensures that FixedController correctly
populates background grid based on user-defined grid
size, after changes for WTD-879.
 2015-02-19 10:22:12 -08:00
Victor Woeltjen
9a50f6d84d [Fixed Position] Fix globals 
Fix globals to pass JSLint check in command line build. WTD-879.
 2015-02-19 09:37:02 -08:00
Victor Woeltjen
7bd41a9f80 [Fixed Position] Allow dragging of elements 
Restore dragging behavior to elements in a fixed position
view, WTD-879.
 2015-02-18 20:29:54 -08:00
Victor Woeltjen
5680710c06 [Fixed Position] Implement remove 
Implement remove button for selected elements in fixed
position view. WTD-879.
 2015-02-18 20:12:55 -08:00
Victor Woeltjen
f66fb0a32d [Fixed Position] Add remove button 
Add a 'remove' button when elements are selected in
fixed position view, WTD-879.
 2015-02-18 19:56:54 -08:00
Victor Woeltjen
a4dd730764 [Fixed Position] Allow select/deselect 
Allow select/deselect of individual elements in fixed position
view, WTD-879.
 2015-02-18 19:51:42 -08:00
Victor Woeltjen
cd98fd475d [Fixed Position] Begin using proxies 
Begin using proxies for elements in fixed position view,
WTD-879.
 2015-02-18 19:41:27 -08:00
Victor Woeltjen
f24f62dedc [Fixed Position] Begin adding element proxy classes 
Begin adding proxy classes to allow the toolbar to interact with
elements in a fixed position view, WTD-879.
 2015-02-18 19:26:06 -08:00
Victor Woeltjen
466a169562 [Fixed Position] Continue refactoring controller 
Continue refactoring Fixed Position controller for
selection support, WTD-879.
 2015-02-18 15:11:52 -08:00
Victor Woeltjen
bf36141e91 [Fixed Position] Begin refactoring controller 
Begin refactoring Fixed Position controller to facilitate
selection support, as well as multiple types of elements;
WTD-879.
 2015-02-18 13:50:25 -08:00
Victor Woeltjen
97b844563d [Fixed Position] Add proxy object 
Add proxy object to represent the selection of the fixed position
view itself, WTD-879.
 2015-02-18 09:03:50 -08:00
Victor Woeltjen
4be2a3f1cd [Fixed Position] Add selection manager 
Add utility class so that layouts/fixed position views
can track their current selection state more simply.
WTD-879.
 2015-02-18 08:55:58 -08:00
Victor Woeltjen
7a680873e3 [Fixed Position] Begin adding placeholder toolbar 
Begin adding placeholder toolbar for fixed position view,
WTD-879.
 2015-02-17 16:29:42 -08:00