ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-04-15 23:16:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolved merge conflicts

Browse Source
This commit is contained in:
Henry 2016-05-12 16:09:53 -07:00
parent 4b786d3536
commit d00e13e4ee
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platform/commonUI/edit/src/actions/SaveAsAction.js
View File

@ -158,6 +158,7 @@ define(
var domainObject = (context || {}).domainObject;
return domainObject !== undefined &&
domainObject.hasCapability("editor") &&
domainObject.getCapability("editor").inEditContext() &&
domainObject.getModel().persisted === undefined;
};

2
platform/commonUI/edit/src/capabilities/EditorCapability.js
View File

@ -49,7 +49,7 @@ define(
* currently being edited.
* @returns boolean
*/
EditorCapability.prototype.isEditing = function () {
EditorCapability.prototype.inEditContext = function () {
return isEditing(this.domainObject);
};

5
platform/commonUI/edit/src/policies/EditActionPolicy.js
View File

@ -72,9 +72,8 @@ define(
*/
function isEditing(context) {
var domainObject = (context || {}).domainObject;
return domainObject &&
domainObject.hasCapability('status') &&
domainObject.getCapability('status').get('editing');
return domainObject
&& domainObject.getCapability('status').get('editing');
}
EditActionPolicy.prototype.allow = function (action, context) {

2
platform/commonUI/edit/src/policies/EditableLinkPolicy.js
View File

@ -40,7 +40,7 @@ define([], function () {
if (key === 'link') {
object = context.selectedObject || context.domainObject;
return !(object.hasCapability("editor") && object.getCapability("editor").isEditing());
return !(object.hasCapability("editor") && object.getCapability("editor").inEditContext());
}
// Like all policies, allow by default.

4
platform/commonUI/edit/src/policies/EditableMovePolicy.js
View File

@ -37,8 +37,8 @@ define([], function () {
selectedObject = context.selectedObject,
key = action.getMetadata().key;
if (key === 'move' && domainObject.hasCapability('editor') && domainObject.getCapability('editor').isEditing()) {
return !!selectedObject && selectedObject.hasCapability('editor') && selectedObject.getCapability('editor').isEditing();
if (key === 'move' && domainObject.hasCapability('editor') && domainObject.getCapability('editor').inEditContext()) {
return !!selectedObject && selectedObject.hasCapability('editor') && selectedObject.getCapability('editor').inEditContext();
}
// Like all policies, allow by default.

2
platform/commonUI/edit/src/policies/EditableViewPolicy.js
View File

@ -37,7 +37,7 @@ define(
// If a view is flagged as non-editable, only allow it
// while we're not in Edit mode.
if ((view || {}).editable === false) {
return !(domainObject.hasCapability('editor') && domainObject.getCapability('editor').isEditing());
return !(domainObject.hasCapability('editor') && domainObject.getCapability('status').get('editing'));
}
// Like all policies, allow by default.

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

@ -42,7 +42,7 @@ define(
// Check if we are in edit mode (also check parents)
function inEditMode(swimlane) {
return swimlane.domainObject.hasCapability('editor') &&
swimlane.domainObject.getCapability('editor').isEditing();
swimlane.domainObject.getCapability('editor').inEditContext();
}
// Boolean and (for reduce below)

2
platform/representation/src/MCTRepresentation.js
View File

@ -170,7 +170,7 @@ define(
representation = lookup($scope.key, domainObject),
uses = ((representation || {}).uses || []),
canRepresent = !!(representation && domainObject),
canEdit = !!(domainObject && domainObject.hasCapability('editor') && domainObject.getCapability('editor').isEditing()),
canEdit = !!(domainObject && domainObject.hasCapability('editor') && domainObject.getCapability('editor').inEditContext()),
idPath = getIdPath(domainObject),
key = $scope.key;