diff options
| author | Pushkar Joshi | 2012-04-17 14:49:18 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-04-17 14:49:18 -0700 |
| commit | df903a01e14134cadf109b733d09c6eadfa3966b (patch) | |
| tree | 2351f1c05b2f852053fa0be533072088a9ad4e7c /js/panels/PanelContainer.reel/PanelContainer.js | |
| parent | 036cf034e124dbc1f4893e90f7c6d240904a3faf (diff) | |
| parent | cacb4a21825818af392c2949967b0f3c1df509c5 (diff) | |
| download | ninja-df903a01e14134cadf109b733d09c6eadfa3966b.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/tools/PenTool.js
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; |