diff options
author | Jon Reid | 2012-03-15 15:01:15 -0700 |
---|---|---|
committer | Jon Reid | 2012-03-15 15:01:15 -0700 |
commit | 75dd0a2d333be1448f3f8bc0edd10f1c9199f84c (patch) | |
tree | f3a157f8cd92a8defb47edc68d8881db46f20586 /js/panels/Splitter.js | |
parent | 21c941bd1fe55e511a72bfa5dc3019748158bd4a (diff) | |
parent | 68d82cb56cb0235599c46caf349f328f15300fdf (diff) | |
download | ninja-75dd0a2d333be1448f3f8bc0edd10f1c9199f84c.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into Timeline-local
Diffstat (limited to 'js/panels/Splitter.js')
-rwxr-xr-x | js/panels/Splitter.js | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js index 3215e928..a396ea28 100755 --- a/js/panels/Splitter.js +++ b/js/panels/Splitter.js | |||
@@ -66,6 +66,7 @@ exports.Splitter = Montage.create(Component, { | |||
66 | var storedData = this.application.localStorage.getItem(this.element.getAttribute("data-montage-id")); | 66 | var storedData = this.application.localStorage.getItem(this.element.getAttribute("data-montage-id")); |
67 | if(storedData && this.element.getAttribute("data-montage-id") !== null) { | 67 | if(storedData && this.element.getAttribute("data-montage-id") !== null) { |
68 | this._collapsed = storedData.value; | 68 | this._collapsed = storedData.value; |
69 | |||
69 | } else { | 70 | } else { |
70 | this._collapsed = false; | 71 | this._collapsed = false; |
71 | } | 72 | } |
@@ -77,13 +78,11 @@ exports.Splitter = Montage.create(Component, { | |||
77 | draw: { | 78 | draw: { |
78 | value: function() { | 79 | value: function() { |
79 | if(this.collapsed) { | 80 | if(this.collapsed) { |
80 | |||
81 | if(this.panel.element) this.panel.element.classList.add("collapsed"); | 81 | if(this.panel.element) this.panel.element.classList.add("collapsed"); |
82 | else this.panel.classList.add("collapsed"); | 82 | else this.panel.classList.add("collapsed"); |
83 | this.element.classList.add("collapsed"); | 83 | this.element.classList.add("collapsed"); |
84 | if(this._resizeBar != null) this.resizeBar.classList.add("collapsed"); | 84 | if(this._resizeBar != null) this.resizeBar.classList.add("collapsed"); |
85 | } | 85 | } else { |
86 | else { | ||
87 | if(this.panel.element) this.panel.element.classList.remove("collapsed"); | 86 | if(this.panel.element) this.panel.element.classList.remove("collapsed"); |
88 | else this.panel.classList.remove("collapsed"); | 87 | else this.panel.classList.remove("collapsed"); |
89 | this.element.classList.remove("collapsed"); | 88 | this.element.classList.remove("collapsed"); |
@@ -92,6 +91,12 @@ exports.Splitter = Montage.create(Component, { | |||
92 | } | 91 | } |
93 | }, | 92 | }, |
94 | 93 | ||
94 | didDraw: { | ||
95 | value: function() { | ||
96 | this.application.ninja.stage.resizeCanvases = true; | ||
97 | } | ||
98 | }, | ||
99 | |||
95 | handleClick : { | 100 | handleClick : { |
96 | value: function() { | 101 | value: function() { |
97 | if (!this.disabled) { | 102 | if (!this.disabled) { |