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

Resolved merge conflicts

Browse Source
This commit is contained in:
Henry
2016-05-12 16:07:39 -07:00
parent cf9eb3f602
commit 433dd87e51
8 changed files with 59 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/features/timeline/src/controllers/swimlane/TimelineSwimlaneDropHandler.js
View File

@@ -41,11 +41,8 @@ define(
// Check if we are in edit mode (also check parents)
function inEditMode(swimlane) {
if (!swimlane.domainObject.getCapability("status").get("editing") && swimlane.parent) {
return inEditMode(swimlane.parent);
} else {
return swimlane.domainObject.getCapability("status").get("editing");
}
return swimlane.domainObject.hasCapability('editor') &&
swimlane.domainObject.getCapability('editor').isEditing();
}
// Boolean and (for reduce below)