aboutsummaryrefslogtreecommitdiff
path: root/js/panels/PanelContainer
diff options
context:
space:
mode:
authorJon Reid2012-02-27 12:08:17 -0800
committerJon Reid2012-02-27 12:08:17 -0800
commitd55224f36da55e26c266a02efa6e58d4ecf1253e (patch)
tree36faa8ff93c0f7b925f5c0a7fb85b5d209da1f8e /js/panels/PanelContainer
parentec5f81c6c0ccf865505ab82ebf9240c667f05c91 (diff)
parentcf9e9b711ba3d77a2a0888f8ab763383f53a1619 (diff)
downloadninja-d55224f36da55e26c266a02efa6e58d4ecf1253e.tar.gz
Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-local
Diffstat (limited to 'js/panels/PanelContainer')
-rwxr-xr-xjs/panels/PanelContainer/PanelContainer.reel/PanelContainer.js12
1 files changed, 9 insertions, 3 deletions
diff --git a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
index b8223471..3cbd4369 100755
--- a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
+++ b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
@@ -63,14 +63,19 @@ exports.PanelContainer = Montage.create(Component, {
63 value: function() { 63 value: function() {
64 //Panels Loading 64 //Panels Loading
65 this.lastOffset = this.element.offsetHeight; 65 this.lastOffset = this.element.offsetHeight;
66
67 /* Old Settings
66 if( this.application.ninja.settings.getSetting(this.element.id, "panelOrder") != null) { 68 if( this.application.ninja.settings.getSetting(this.element.id, "panelOrder") != null) {
67 this.initPanelOrder = this.application.ninja.settings.getSetting(this.element.id, "panelOrder") 69 this.initPanelOrder = this.application.ninja.settings.getSetting(this.element.id, "panelOrder")
68 } 70 }
71 */
72
69 // if Panels already loaded no need to load again. 73 // if Panels already loaded no need to load again.
70 for(var i = 0; i < this.initPanelOrder.length; i++) { 74 for(var i = 0; i < this.initPanelOrder.length; i++) {
71 this.addPanel(eval(this.initPanelOrder[i])); 75 this.addPanel(eval(this.initPanelOrder[i]));
72 this.panelOrder.push(this.initPanelOrder[i]); 76 this.panelOrder.push(this.initPanelOrder[i]);
73 this.application.ninja.settings.setSetting(this.element.id, "panelOrder", this.panelOrder); 77
78// this.application.ninja.settings.setSetting(this.element.id, "panelOrder", this.panelOrder);
74 } 79 }
75 80
76 var hideSplitter = true; 81 var hideSplitter = true;
@@ -221,7 +226,7 @@ exports.PanelContainer = Montage.create(Component, {
221 } 226 }
222 minHeights -= this._panels[lastPanel].minHeight - this._collapsedHeight; 227 minHeights -= this._panels[lastPanel].minHeight - this._collapsedHeight;
223 this._panels[lastPanel].collapsed = true; 228 this._panels[lastPanel].collapsed = true;
224 this.repeater.childComponents[lastPanel].needsDraw = true; 229 //this.repeater.childComponents[lastPanel].needsDraw = true;
225 230
226 231
227 } 232 }
@@ -329,7 +334,8 @@ exports.PanelContainer = Montage.create(Component, {
329 this._panels.splice(overed,0, panelRemoved[0]); 334 this._panels.splice(overed,0, panelRemoved[0]);
330 var panelOrderRemoved = this.panelOrder.splice(selected,1); 335 var panelOrderRemoved = this.panelOrder.splice(selected,1);
331 this.panelOrder.splice(overed,0, panelOrderRemoved[0]); 336 this.panelOrder.splice(overed,0, panelOrderRemoved[0]);
332 this.application.ninja.settings.setSetting(this.element.id, "panelOrder", this.panelOrder); 337
338 //this.application.ninja.settings.setSetting(this.element.id, "panelOrder", this.panelOrder);
333 } 339 }
334 } 340 }
335 }, 341 },