ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-16 06:08:11 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Fixed Position] Allow select/deselect

Browse Source 
Allow select/deselect of individual elements in fixed position
view, WTD-879.
This commit is contained in:
Victor Woeltjen
2015-02-18 19:51:42 -08:00
parent cd98fd475d
commit a4dd730764
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platform/features/layout/res/templates/fixed.html
View File

@ -3,16 +3,18 @@
mct-resize="controller.setBounds(bounds)"> mct-resize="controller.setBounds(bounds)">
<!-- Background grid --> <!-- Background grid -->
<div ng-repeat="cell in controller.getCellStyles()" <span ng-click="controller.clearSelection()">
style="position: absolute; border: 1px gray solid; background: black;" <div ng-repeat="cell in controller.getCellStyles()"
ng-click="controller.deselect()" style="position: absolute; border: 1px gray solid; background: black;"
ng-style="cell"> ng-style="cell">
</div> </div>
</span>
<!-- Fixed position elements --> <!-- Fixed position elements -->
<mct-include ng-repeat="element in controller.getDecoratedElements()" <mct-include ng-repeat="element in controller.getDecoratedElements()"
style="position: absolute;" style="position: absolute;"
key="element.template" key="element.template"
ng-class="{ test: controller.selected(element) }"
ng-style="element.style" ng-style="element.style"
ng-click="controller.select(element)" ng-click="controller.select(element)"
ng-model="element"> ng-model="element">

12
platform/features/layout/src/FixedController.js
View File

@ -20,8 +20,6 @@ define(
function FixedController($scope, telemetrySubscriber, telemetryFormatter) { function FixedController($scope, telemetrySubscriber, telemetryFormatter) {
var gridSize = DEFAULT_GRID_SIZE, var gridSize = DEFAULT_GRID_SIZE,
gridExtent = DEFAULT_GRID_EXTENT, gridExtent = DEFAULT_GRID_EXTENT,
activeDrag,
activeDragId,
subscription, subscription,
cellStyles = [], cellStyles = [],
elementProxies = [], elementProxies = [],
@ -213,20 +211,24 @@ define(
* @returns {boolean} true if selected * @returns {boolean} true if selected
*/ */
selected: function (element) { selected: function (element) {
return selection.selected(element); return selection && selection.selected(element);
}, },
/** /**
* Set the active user selection in this view. * Set the active user selection in this view.
* @param element the element to select * @param element the element to select
*/ */
select: function (element) { select: function (element) {
selection.select(element); if (selection) {
selection.select(element);
}
}, },
/** /**
* Clear the current user selection. * Clear the current user selection.
*/ */
clearSelection: function () { clearSelection: function () {
selection.deselect(); if (selection) {
selection.deselect();
}
}, },
/** /**
* Start a drag gesture to move/resize a frame. * Start a drag gesture to move/resize a frame.