aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Panel.reel/Panel.js
diff options
context:
space:
mode:
authorJonathan Duran2012-04-18 08:08:14 -0700
committerJonathan Duran2012-04-18 08:08:14 -0700
commit9f05148454783fd761c9cad35a169c6cb164c1a4 (patch)
tree02b9cac67ce4215443beab9f47fa4cf216e77840 /js/panels/Panel.reel/Panel.js
parenta2af3c8bd2349a24dd7de920381b04847a863a46 (diff)
parent616a8532099fec2a15855eac97cd85cb60c4451c (diff)
downloadninja-9f05148454783fd761c9cad35a169c6cb164c1a4.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/panels/Panel.reel/Panel.js')
-rwxr-xr-xjs/panels/Panel.reel/Panel.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/js/panels/Panel.reel/Panel.js b/js/panels/Panel.reel/Panel.js
index 33f9b3a7..613bef4b 100755
--- a/js/panels/Panel.reel/Panel.js
+++ b/js/panels/Panel.reel/Panel.js
@@ -125,7 +125,10 @@ exports.Panel = Montage.create(Component, {
125 require.async(this.modulePath) 125 require.async(this.modulePath)
126 .then(function(panelContent) { 126 .then(function(panelContent) {
127 var componentRequire = panelContent[that.moduleName]; 127 var componentRequire = panelContent[that.moduleName];
128 that.panelContent.content = componentRequire.create(); 128 var componentInstance = componentRequire.create();
129
130 componentInstance.ownerComponent = that.ownerComponent;
131 that.panelContent.content = componentInstance;
129 }) 132 })
130 .end(); 133 .end();
131 } 134 }