ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-09 14:32:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Consistent composition order (#2209)

Browse Source 
* ensure composition loads in specified order

* Remove Modern JS to match current style guide
This commit is contained in:
Pete Richards 2018-11-07 10:07:57 -08:00 committed by Andrew Henry
parent e710cafb2c
commit 4bda4080d2
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/composition/CompositionCollection.js
View File

@ -177,7 +177,15 @@ define([
CompositionCollection.prototype.load = function () { CompositionCollection.prototype.load = function () {
return this.provider.load(this.domainObject) return this.provider.load(this.domainObject)
.then(function (children) { .then(function (children) {
return Promise.all(children.map(this.onProviderAdd, this)); return Promise.all(children.map(function (c) {
return this.publicAPI.objects.get(c);
}, this));
}.bind(this))
.then(function (childObjects) {
childObjects.forEach(function (c) {
this.add(c, true);
}, this);
return childObjects;
}.bind(this)) }.bind(this))
.then(function (children) { .then(function (children) {
this.emit('load'); this.emit('load');