aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Collapser.js
diff options
context:
space:
mode:
authorAnanya Sen2012-06-21 11:07:11 -0700
committerAnanya Sen2012-06-21 11:07:11 -0700
commit6915d6607f2d768f363baed84287f6593925ae1e (patch)
tree306738165c11fab764a27c3e76d93c2e4d86f297 /js/panels/Timeline/Collapser.js
parent8db9e73ca68c006769af3997034959f6b7008add (diff)
parentc8fc6d15e1570e89243abe527cd149e354f7e11f (diff)
downloadninja-6915d6607f2d768f363baed84287f6593925ae1e.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/panels/Timeline/Collapser.js')
-rw-r--r--js/panels/Timeline/Collapser.js2
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) {