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

Merge remote-tracking branch 'origin/tree-refresh-745'

Browse Source
This commit is contained in:
Pete Richards
2016-03-17 11:40:53 -07:00
parent 07d554d114 324c2cac03
commit 8f6a287fb8
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
platform/commonUI/general/src/ui/TreeView.js
View File

@@ -60,8 +60,9 @@ define([
} }
}; };
TreeView.prototype.loadComposition = function (domainObject) { TreeView.prototype.loadComposition = function () {
var self = this; var self = this,
domainObject = this.activeObject;
function addNode(domainObject, index) { function addNode(domainObject, index) {
self.nodeViews[index].model(domainObject); self.nodeViews[index].model(domainObject);

2
platform/commonUI/general/test/ui/TreeViewSpec.js
View File

@@ -167,7 +167,7 @@ define([
beforeEach(function () { beforeEach(function () {
mockComposition.pop(); mockComposition.pop();
testCapabilities.mutation.listen testCapabilities.mutation.listen
.mostRecentCall.args[0](mockDomainObject); .mostRecentCall.args[0](mockDomainObject.getModel());
waitForCompositionCallback(); waitForCompositionCallback();
}); });