aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-05-04 14:00:54 -0700
committerJose Antonio Marquez2012-05-04 14:00:54 -0700
commit9c0bda09a502472768f6dd5090a882d11be58d23 (patch)
tree28eb75165553daa979be3bc9223d35d875a008dc /js/panels
parent2456f0d60f642016135aa0f96126cb3249343757 (diff)
parentfec9ccee11ea21ffc95edce6e89d0d302b63e3d8 (diff)
downloadninja-9c0bda09a502472768f6dd5090a882d11be58d23.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/Splitter.js35
1 files changed, 34 insertions, 1 deletions
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index 98ebb36a..0640abb2 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -55,7 +55,6 @@ exports.Splitter = Montage.create(Component, {
55 }, 55 },
56 set: function(value) { 56 set: function(value) {
57 this._collapsed = value; 57 this._collapsed = value;
58
59 this.application.localStorage.setItem(this.element.getAttribute("data-montage-id"), {"version": this.version, "value": value}); 58 this.application.localStorage.setItem(this.element.getAttribute("data-montage-id"), {"version": this.version, "value": value});
60 } 59 }
61 }, 60 },
@@ -139,5 +138,39 @@ exports.Splitter = Montage.create(Component, {
139 value: function() { 138 value: function() {
140 this.handleClick(); 139 this.handleClick();
141 } 140 }
141 },
142
143 collapse:{
144 value: function() {
145 if (this.collapsed === false) {
146 if(this.panel.element) {
147 this.panel.element.addEventListener("webkitTransitionEnd", this, false);
148 } else {
149 this.panel.addEventListener("webkitTransitionEnd", this, false);
150 }
151 this._collapsed = true;
152 this.needsDraw = true;
153 }
154 }
155 },
156 restore:{
157 value: function() {
158 //Get splitter initial value from SettingManager
159 var storedData = this.application.localStorage.getItem(this.element.getAttribute("data-montage-id")), temp = this.collapsed;
160 if(storedData && this.element.getAttribute("data-montage-id") !== null) {
161 this._collapsed = storedData.value;
162
163 } else {
164 this._collapsed = false;
165 }
166 if(temp != this._collapsed){
167 if(this.panel.element) {
168 this.panel.element.addEventListener("webkitTransitionEnd", this, false);
169 } else {
170 this.panel.addEventListener("webkitTransitionEnd", this, false);
171 }
172 this.needsDraw = true;
173 }
174 }
142 } 175 }
143}); 176});