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

[New Edit Mode] #633 Removed Editing workflow concerns from FixedController, LayoutController

Browse Source
This commit is contained in:
Henry
2016-05-12 19:12:00 -07:00
parent 25a2321578
commit b6502e9ea1
4 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/commonUI/edit/src/representers/EditRepresenter.js
View File

@ -91,14 +91,8 @@ define(
} }
} }
function setEditable(editableDomainObject) {
self.domainObject = editableDomainObject;
scope.model = editableDomainObject.getModel();
}
// Place the "commit" method in the scope // Place the "commit" method in the scope
scope.commit = commit; scope.commit = commit;
scope.setEditable = setEditable;
// Clean up when the scope is destroyed // Clean up when the scope is destroyed
scope.$on("$destroy", function () { scope.$on("$destroy", function () {

3
platform/features/layout/bundle.js
View File

@ -71,9 +71,6 @@ define([
"uses": [ "uses": [
"composition" "composition"
], ],
"gestures": [
"drop"
],
"toolbar": { "toolbar": {
"sections": [ "sections": [
{ {

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

@ -271,15 +271,13 @@ define(
} }
// Position a panel after a drop event // Position a panel after a drop event
function handleDrop(e, id, position, editableDomainObject) { function handleDrop(e, id, position) {
// Don't handle this event if it has already been handled // Don't handle this event if it has already been handled
// color is set to "" to let the CSS theme determine the default color // color is set to "" to let the CSS theme determine the default color
if (e.defaultPrevented) { if (e.defaultPrevented) {
return; return;
} }
if (editableDomainObject) {
$scope.setEditable(editableDomainObject);
}
e.preventDefault(); e.preventDefault();
// Store the position of this element. // Store the position of this element.
addElement({ addElement({

8
platform/features/layout/src/LayoutController.js
View File

@ -60,15 +60,11 @@ define(
} }
// Position a panel after a drop event // Position a panel after a drop event
//An editableDomainObject is provided, as the drop may have function handleDrop(e, id, position) {
// triggered a transition to edit mode.
function handleDrop(e, id, position, editableDomainObject) {
if (e.defaultPrevented) { if (e.defaultPrevented) {
return; return;
} }
if (editableDomainObject) {
$scope.setEditable(editableDomainObject);
}
// Ensure that configuration field is populated // Ensure that configuration field is populated
$scope.configuration = $scope.configuration || {}; $scope.configuration = $scope.configuration || {};
// Make sure there is a "panels" field in the // Make sure there is a "panels" field in the