ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-30 01:48:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'open1071' into open-master

Browse Source 
Merge changes for WTD-1071
This commit is contained in:
Victor Woeltjen 2015-04-08 12:38:17 -07:00
commit 3707a68ea1
3 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform/commonUI/edit/src/objects/EditableDomainObjectCache.js
View File

@ -51,6 +51,11 @@ define(
// some special behavior for its context capability.
root = root || domainObject;
// Avoid double-wrapping (WTD-1017)
if (domainObject.hasCapability('editor')) {
return domainObject;
}
// Provide an editable form of the object
return new EditableDomainObject(
domainObject,

2
platform/commonUI/edit/test/controllers/EditControllerSpec.js
View File

@ -25,7 +25,7 @@ define(
);
mockObject = jasmine.createSpyObj(
"domainObject",
[ "getId", "getModel", "getCapability" ]
[ "getId", "getModel", "getCapability", "hasCapability" ]
);
mockCapability = jasmine.createSpyObj(
"capability",

19
platform/commonUI/edit/test/objects/EditableDomainObjectCacheSpec.js
View File

@ -21,6 +21,9 @@ define(
getModel: function () { return {}; },
getCapability: function (name) {
return completionCapability;
},
hasCapability: function (name) {
return false;
}
};
}
@ -29,6 +32,9 @@ define(
var result = Object.create(domainObject);
result.wrapped = true;
result.wrappedModel = model;
result.hasCapability = function (name) {
return name === 'editor';
};
captured.wraps = (captured.wraps || 0) + 1;
return result;
}
@ -112,6 +118,19 @@ define(
expect(cache.isRoot(domainObjects[2])).toBeFalsy();
});
it("does not double-wrap objects", function () {
var domainObject = new TestObject('test-id'),
wrappedObject = cache.getEditableObject(domainObject);
// Same instance should be returned if you try to wrap
// twice. This is necessary, since it's possible to (e.g.)
// use a context capability on an object retrieved via
// composition, in which case a result will already be
// wrapped.
expect(cache.getEditableObject(wrappedObject))
.toBe(wrappedObject);
});
});
}