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

Merge branch 'open-master' into open1482c

Browse Source 
Merge in latest in preparation to merge; WTD-1482

Conflicts:
	platform/commonUI/browse/src/creation/CreationService.js
	platform/core/src/models/RootModelProvider.js
	platform/entanglement/src/services/LinkService.js
	platform/entanglement/src/services/MoveService.js
This commit is contained in:
Victor Woeltjen
2015-08-19 15:00:52 -07:00
parent f6cf4c3215 9c578c53db
commit f27e4d6e06
39 changed files with 1494 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platform/core/src/models/RootModelProvider.js
View File

@@ -50,6 +50,14 @@ define(
// Pull out identifiers to used as ROOT's
var ids = roots.map(function (root) { return root.id; });
// Assign an initial location to root models
roots.forEach(function (root) {
if (!root.model) {
root.model = {};
}
root.model.location = 'ROOT';
});
this.baseProvider = new StaticModelProvider(roots, $q, $log);
this.rootModel = {
name: "The root object",

8
platform/core/test/models/RootModelProviderSpec.js
View File

@@ -79,6 +79,12 @@ define(
expect(captured.b.someProperty).toEqual("Some Value B");
});
it("provides models with a location", function () {
provider.getModels(["a", "b"]).then(capture);
expect(captured.a.location).toBe('ROOT');
expect(captured.b.location).toBe('ROOT');
});
it("does not provide models which are not in extension declarations", function () {
provider.getModels(["c"]).then(capture);
@@ -96,4 +102,4 @@ define(
});
}
);
);