diff options
| author | Nivesh Rajbhandari | 2012-04-17 11:10:10 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-04-17 11:10:10 -0700 |
| commit | 6d3af6cb9dc8223102854ad95a5c4c501fc62c8b (patch) | |
| tree | 07afdbeacd26f01414933d5b3318786cec30f4a8 /js/panels/PanelContainer.reel/PanelContainer.js | |
| parent | 2a87a750f06003fc62e8e0e73983e14ce24fc7a7 (diff) | |
| parent | cacb4a21825818af392c2949967b0f3c1df509c5 (diff) | |
| download | ninja-6d3af6cb9dc8223102854ad95a5c4c501fc62c8b.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/panels/PanelContainer.reel/PanelContainer.js')
| -rwxr-xr-x | js/panels/PanelContainer.reel/PanelContainer.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/panels/PanelContainer.reel/PanelContainer.js b/js/panels/PanelContainer.reel/PanelContainer.js index c40bbc21..8d1d6a5e 100755 --- a/js/panels/PanelContainer.reel/PanelContainer.js +++ b/js/panels/PanelContainer.reel/PanelContainer.js | |||
| @@ -45,6 +45,7 @@ exports.PanelContainer = Montage.create(Component, { | |||
| 45 | this['panel_'+i].minHeight= p.minHeight; | 45 | this['panel_'+i].minHeight= p.minHeight; |
| 46 | this['panel_'+i].maxHeight = p.maxHeight; | 46 | this['panel_'+i].maxHeight = p.maxHeight; |
| 47 | this['panel_'+i].flexible = p.flexible; | 47 | this['panel_'+i].flexible = p.flexible; |
| 48 | this['panel_'+i].collapsed = p.collapsed; | ||
| 48 | this['panel_'+i].modulePath = p.modulePath; | 49 | this['panel_'+i].modulePath = p.modulePath; |
| 49 | this['panel_'+i].moduleName = p.moduleName; | 50 | this['panel_'+i].moduleName = p.moduleName; |
| 50 | this['panel_'+i].disabled = true; | 51 | this['panel_'+i].disabled = true; |