aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Collapser.js
diff options
context:
space:
mode:
authorJose Antonio Marquez Russo2012-03-08 10:49:06 -0800
committerJose Antonio Marquez Russo2012-03-08 10:49:06 -0800
commit85f21e020ac281e8e545df1cf269034de99a00b1 (patch)
tree441834fa8b02b1cc2a970210020d27e06d2c99be /js/panels/Timeline/Collapser.js
parentd9813946dc28d8c28033a68b68300b9d9eda115c (diff)
parent11a6f18e274d7232cdbb8f6e9e65e0a5ab756451 (diff)
downloadninja-85f21e020ac281e8e545df1cf269034de99a00b1.tar.gz
Merge pull request #29 from ericmueller/integration
Integration
Diffstat (limited to 'js/panels/Timeline/Collapser.js')
-rw-r--r--js/panels/Timeline/Collapser.js26
1 files changed, 24 insertions, 2 deletions
diff --git a/js/panels/Timeline/Collapser.js b/js/panels/Timeline/Collapser.js
index ad490c2e..d161cdd7 100644
--- a/js/panels/Timeline/Collapser.js
+++ b/js/panels/Timeline/Collapser.js
@@ -68,7 +68,7 @@ var Montage = require("montage/core/core").Montage,
68 }, 68 },
69 69
70 _bypassAnimation : { 70 _bypassAnimation : {
71 value: false 71 value: true
72 }, 72 },
73 bypassAnimation: { 73 bypassAnimation: {
74 get: function() { 74 get: function() {
@@ -169,6 +169,28 @@ var Montage = require("montage/core/core").Montage,
169 } 169 }
170 }, 170 },
171 171
172 _isToggling: {
173 serializable: true,
174 value: true
175 },
176 isToggling: {
177 serializable: true,
178 get: function() {
179 return this._isToggling;
180 },
181 set: function(newVal) {
182 if (newVal !== this._isToggling) {
183 this._isToggling = newVal;
184
185 if (this.bypassAnimation) {
186 this.isAnimated = false;
187 }
188 this.myContent.classList.remove(this.transitionClass);
189 this.handleCollapserLabelClick();
190 }
191 }
192 },
193
172 /* === END: Models === */ 194 /* === END: Models === */
173 195
174 /* === BEGIN: Draw cycle === */ 196 /* === BEGIN: Draw cycle === */
@@ -321,7 +343,7 @@ var Montage = require("montage/core/core").Montage,
321 } 343 }
322 344
323 if (this.bypassAnimation) { 345 if (this.bypassAnimation) {
324 this.bypassAnimation = false; 346 this.bypassAnimation = true;
325 this.isAnimated = true; 347 this.isAnimated = true;
326 } 348 }
327 } 349 }