diff options
author | Jose Antonio Marquez | 2012-06-21 09:55:35 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-21 09:55:35 -0700 |
commit | 28aa1276ffb6cefca7f7d58906cf8380fc6253eb (patch) | |
tree | c9a4a6f5d18693c39fbc668567125211151c9213 /js/panels/Timeline/Collapser.js | |
parent | 4eff115126ab946c5852d787fd596e07b156c9a5 (diff) | |
parent | c8fc6d15e1570e89243abe527cd149e354f7e11f (diff) | |
download | ninja-28aa1276ffb6cefca7f7d58906cf8380fc6253eb.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/panels/Timeline/Collapser.js')
-rw-r--r-- | js/panels/Timeline/Collapser.js | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/js/panels/Timeline/Collapser.js b/js/panels/Timeline/Collapser.js index e5c04279..42bbbb86 100644 --- a/js/panels/Timeline/Collapser.js +++ b/js/panels/Timeline/Collapser.js | |||
@@ -183,7 +183,6 @@ var Montage = require("montage/core/core").Montage, | |||
183 | 183 | ||
184 | // isToggling: Bindable property. Set this (to anything) to trigger a toggle. | 184 | // isToggling: Bindable property. Set this (to anything) to trigger a toggle. |
185 | _isToggling: { | 185 | _isToggling: { |
186 | serializable: true, | ||
187 | value: true | 186 | value: true |
188 | }, | 187 | }, |
189 | isToggling: { | 188 | isToggling: { |
@@ -211,7 +210,6 @@ var Montage = require("montage/core/core").Montage, | |||
211 | 210 | ||
212 | prepareForDraw: { | 211 | prepareForDraw: { |
213 | value: function() { | 212 | value: function() { |
214 | |||
215 | // Get the original value of the overflow property: | 213 | // Get the original value of the overflow property: |
216 | this._origOverflowValue = window.getComputedStyle(this.myContent, null).getPropertyValue("overflow"); | 214 | this._origOverflowValue = window.getComputedStyle(this.myContent, null).getPropertyValue("overflow"); |
217 | if (this.isCollapsed === false) { | 215 | if (this.isCollapsed === false) { |