ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-31 08:25:31 +00:00
Code Issues Actions 4 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,20 @@ define(
this.domainObject.getCapability('status').set('editing', true);
};
function isEditing (domainObject) {
return domainObject.getCapability('status').get('editing') ||
domainObject.hasCapability('context') && isEditing(domainObject.getCapability('context').getParent());
}
/**
* Determines whether this object, or any of its ancestors are
* currently being edited.
* @returns boolean
*/
EditorCapability.prototype.isEditing = function () {
return isEditing(this.domainObject);
};
EditorCapability.prototype.save = function () {
var domainObject = this.domainObject;
return this.transactionService.commit().then(function() {
@ -60,8 +74,10 @@ define(
return this.dirtyModelCache.isDirty(this.domainObject);
};
//TODO: add 'appliesTo'. EditorCapability should not be available
// for objects that should not be edited
EditorCapability.prototype.appliesTo = function(context) {
var domainObject = context.domainObject;
return domainObject && domainObject.getType().hasFeature("creation");
}
return EditorCapability;
}

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

@ -35,11 +35,12 @@ define([], function () {
}
EditableLinkPolicy.prototype.allow = function (action, context) {
var key = action.getMetadata().key;
var key = action.getMetadata().key,
object;
if (key === 'link') {
return !((context.selectedObject || context.domainObject)
.hasCapability('editor'));
object = context.selectedObject || context.domainObject;
return !(object.hasCapability("editor") && object.getCapability("editor").isEditing());
}
// 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')) {
return !!selectedObject && selectedObject.hasCapability('editor');
if (key === 'move' && domainObject.hasCapability('editor') && domainObject.getCapability('editor').isEditing()) {
return !!selectedObject && selectedObject.hasCapability('editor') && selectedObject.getCapability('editor').isEditing();
}
// 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');
return !(domainObject.hasCapability('editor') && domainObject.getCapability('editor').isEditing());
}
// Like all policies, allow by default.

18
platform/commonUI/regions/src/InspectorController.js
View File

@ -32,7 +32,8 @@ define(
*/
function InspectorController($scope, policyService) {
var domainObject = $scope.domainObject,
typeCapability = domainObject.getCapability('type');
typeCapability = domainObject.getCapability('type'),
listener;
/**
* Filters region parts to only those allowed by region policies
@ -46,7 +47,20 @@ define(
});
}
$scope.regions = filterRegions(typeCapability.getDefinition().inspector || new InspectorRegion());
function setRegions() {
$scope.regions = filterRegions(typeCapability.getDefinition().inspector || new InspectorRegion());
}
//Listen for changes to object status that might necessitate
// recalculation of screen regions.
//listener =
// domainObject.getCapability("status").listen(setRegions);
setRegions();
$scope.$on("$destroy", function() {
listener();
})
}
return InspectorController;

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)

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

@ -53,7 +53,8 @@ define(
* @param {ViewDefinition[]} views an array of view extensions
*/
function MCTRepresentation(representations, views, representers, $q, templateLinker, $log) {
var representationMap = {};
var representationMap = {},
domainObjectListener;
// Assemble all representations and views
// The distinction between views and representations is
@ -167,7 +168,7 @@ define(
representation = lookup($scope.key, domainObject),
uses = ((representation || {}).uses || []),
canRepresent = !!(representation && domainObject),
canEdit = !!(domainObject && domainObject.hasCapability('editor')),
canEdit = !!(domainObject && domainObject.hasCapability('editor') && domainObject.getCapability('editor').isEditing()),
idPath = getIdPath(domainObject),
key = $scope.key;
@ -175,6 +176,8 @@ define(
return;
}
console.log("changed");
// Create an empty object named "representation", for this
// representation to store local variables into.
$scope.representation = {};
@ -237,7 +240,17 @@ define(
// Also update when the represented domain object changes
// (to a different object)
$scope.$watch("domainObject", refresh);
//$scope.$watch("domainObject", refresh);
$scope.$watch("domainObject", function (domainObject) {
if (domainObjectListener) {
domainObjectListener();
}
if (domainObject) {
domainObjectListener = domainObject.getCapability('status').listen(refresh);
}
refresh();
});
// Finally, also update when there is a new version of that
// same domain object; these changes should be tracked in the

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

@ -103,7 +103,6 @@ define(
// the change.
if (id) {
e.preventDefault();
if (domainObjectType!=='folder') {
domainObject.getCapability('action').perform('edit');
}