diff options
author | Nivesh Rajbhandari | 2012-04-17 13:28:06 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-17 13:28:06 -0700 |
commit | 88f83856dcec50fd850622eec21195379e5844fb (patch) | |
tree | f6aa54de1100d6d5b9a2e3683f10daf61f865ad1 /js/panels/Panel.reel/Panel.js | |
parent | f11ed767396996c236bb8ef0e5f89fedddcaa0d7 (diff) | |
parent | cacb4a21825818af392c2949967b0f3c1df509c5 (diff) | |
download | ninja-88f83856dcec50fd850622eec21195379e5844fb.tar.gz |
Merge branch 'refs/heads/ninja-internal' into AllFixes
Diffstat (limited to 'js/panels/Panel.reel/Panel.js')
-rwxr-xr-x | js/panels/Panel.reel/Panel.js | 5 |
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 | } |