diff options
author | Armen Kesablyan | 2012-06-21 14:36:32 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-21 14:36:32 -0700 |
commit | d9f9a65226dfe26500e82061cc38a7dda302f720 (patch) | |
tree | 32ae4d83164e71f83bf60eaaf0969d80a4d1e8b4 /js/panels/Timeline/Collapser.js | |
parent | 1830a7cf4150087ee12711ea75f1162e6e3c2934 (diff) | |
parent | 9fe9bc495af74d963fa7061d4d1a479720133a56 (diff) | |
download | ninja-d9f9a65226dfe26500e82061cc38a7dda302f720.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/hintable.reel/hintable.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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) { |