ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-20 05:37:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Fixed Position] Allow dragging of elements

Browse Source 
Restore dragging behavior to elements in a fixed position
view, WTD-879.
This commit is contained in:
Victor Woeltjen 2015-02-18 20:29:54 -08:00
parent 5680710c06
commit 7bd41a9f80
3 changed files with 27 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,15 +17,9 @@
ng-class="{ test: controller.selected(element) }"
ng-style="element.style"
ng-click="controller.select(element)"
ng-model="element">
</mct-include>
<!-- Drag handles -->
<span ng-show="false && domainObject.hasCapability('editor')">
<span style="position: absolute; left: 0px; right: 0px; top: 0px; bottom: 0px; cursor: move;"
mct-drag-down="controller.startDrag(element, [1,1], [0,0])"
mct-drag="controller.continueDrag(element)"
ng-model="element"
mct-drag-down="controller.startDrag(element); controller.select(element)"
mct-drag="controller.continueDrag(delta)"
mct-drag-up="controller.endDrag()">
</span>
</span>
</mct-include>
</div>

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

@ -20,6 +20,7 @@ define(
function FixedController($scope, telemetrySubscriber, telemetryFormatter) {
var gridSize = DEFAULT_GRID_SIZE,
gridExtent = DEFAULT_GRID_EXTENT,
dragging,
subscription,
cellStyles = [],
elementProxies = [],
@ -265,20 +266,18 @@ define(
* with the mouse while the horizontal dimensions shrink in
* kind (and vertical properties remain unmodified.)
*
* @param {string} id the identifier of the domain object
* in the frame being manipulated
* @param {number[]} posFactor the position factor
* @param {number[]} dimFactor the dimensions factor
* @param element the raw (undecorated) element to drag
*/
startDrag: function (id, posFactor, dimFactor) {
// TODO: Drag!
// activeDragId = id;
// activeDrag = new LayoutDrag(
// rawPositions[id],
// posFactor,
// dimFactor,
// gridSize
// );
startDrag: function (element) {
// Only allow dragging in edit mode
if ($scope.domainObject &&
$scope.domainObject.hasCapability('editor')) {
dragging = {
element: element,
x: element.x(),
y: element.y()
};
}
},
/**
* Continue an active drag gesture.
@ -287,34 +286,22 @@ define(
* to its position when the drag started
*/
continueDrag: function (delta) {
// TODO: Drag!
// if (activeDrag) {
// rawPositions[activeDragId] =
// activeDrag.getAdjustedPosition(delta);
// populatePosition(activeDragId);
// }
if (dragging) {
dragging.element.x(dragging.x + Math.round(delta[0] / gridSize[0]));
dragging.element.y(dragging.y + Math.round(delta[1] / gridSize[1]));
dragging.element.style = convertPosition(dragging.element.element);
}
},
/**
* End the active drag gesture. This will update the
* view configuration.
*/
endDrag: function () {
// TODO: Drag!
// // Write to configuration; this is watched and
// // saved by the EditRepresenter.
// $scope.configuration =
// $scope.configuration || {};
// // Make sure there is a "panels" field in the
// // view configuration.
// $scope.configuration.elements =
// $scope.configuration.elements || {};
// // Store the position of this panel.
// $scope.configuration.elements[activeDragId] =
// rawPositions[activeDragId];
// // Mark this object as dirty to encourage persistence
// if ($scope.commit) {
// $scope.commit("Moved element.");
// }
// Mark this object as dirty to encourage persistence
if (dragging && $scope.commit) {
dragging = undefined;
$scope.commit("Moved element.");
}
}
};

2
platform/features/layout/src/elements/Accessor.js
View File

@ -17,7 +17,7 @@ define(
if (arguments.length > 0) {
object[key] = value;
}
return value;
return object[key];
};
}