alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[New Edit Mode Prototype] Hide edit button when in edit mode #350. - Modified edit policy to hide edit button when in edit mode

Browse Source
This commit is contained in:
Henry
2015-11-30 17:45:46 -08:00
parent acb7d4b807
commit 4f3c9f270b
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platform/representation/src/gestures/DropGesture.js
View File

@@ -134,8 +134,7 @@ define(
function drop(e) {
var event = (e || {}).originalEvent || e,
id = event.dataTransfer.getData(GestureConstants.MCT_DRAG_TYPE),
domainObjectType = editableDomainObject.getModel().type,
virtualPanel;
domainObjectType = editableDomainObject.getModel().type;
// If currently in edit mode allow drag and drop gestures to the
// domain object. An exception to this is folders which have drop
@@ -147,10 +146,10 @@ define(
// the change.
if (id) {
if (shouldCreateVirtualPanel(domainObject)){
navigationService.setNavigation(createVirtualPanel(domainObject, id));
editableDomainObject = createVirtualPanel(domainObject, id)
navigationService.setNavigation(editableDomainObject);
broadcastDrop(id, event);
} else {
editableDomainObject.getCapability('status').set('editing', true);
$q.when(action && action.perform()).then(function (result) {
//Don't go into edit mode for folders
if (domainObjectType!=='folder') {
@@ -159,6 +158,7 @@ define(
broadcastDrop(id, event);
});
}
editableDomainObject.getCapability('status').set('editing', true);
}
//}
// TODO: Alert user if drag and drop is not allowed