aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Panel.reel
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-17 11:10:10 -0700
committerNivesh Rajbhandari2012-04-17 11:10:10 -0700
commit6d3af6cb9dc8223102854ad95a5c4c501fc62c8b (patch)
tree07afdbeacd26f01414933d5b3318786cec30f4a8 /js/panels/Panel.reel
parent2a87a750f06003fc62e8e0e73983e14ce24fc7a7 (diff)
parentcacb4a21825818af392c2949967b0f3c1df509c5 (diff)
downloadninja-6d3af6cb9dc8223102854ad95a5c4c501fc62c8b.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/panels/Panel.reel')
-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 }