aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Collapser.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-21 09:55:25 -0700
committerJose Antonio Marquez2012-06-21 09:55:25 -0700
commitd9f2064fc7dc5284e159032e3efbab5de9b2dc14 (patch)
treef648fa7842f3dc6011da08aaab0bedb445d43b58 /js/panels/Timeline/Collapser.js
parent313a62245400e6c8cfa6d2f02c603cc7f01ddfc6 (diff)
parentc8fc6d15e1570e89243abe527cd149e354f7e11f (diff)
downloadninja-d9f2064fc7dc5284e159032e3efbab5de9b2dc14.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
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) {