aboutsummaryrefslogtreecommitdiff
path: root/js/panels/PanelContainer/PanelContainer.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-28 14:01:05 -0800
committerPushkar Joshi2012-02-28 14:01:05 -0800
commit63307c9abf120985d979a40a53a0598d3f0d5c5a (patch)
tree57d9cffd7aa0959ea31fe0fa2d89a9080198bcb3 /js/panels/PanelContainer/PanelContainer.reel
parente1a65d0c2a13e12ee53be98c731616e35aa07a41 (diff)
parent7c9291a5bab4abd849547f8878f6fb962fc88250 (diff)
downloadninja-63307c9abf120985d979a40a53a0598d3f0d5c5a.tar.gz
Merge branch 'master' into pentool
Conflicts: manifest.json
Diffstat (limited to 'js/panels/PanelContainer/PanelContainer.reel')
-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 },