diff options
author | Jose Antonio Marquez | 2012-03-02 19:06:37 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-03-02 19:06:37 -0800 |
commit | 5c49635cc44815364f9a0296ffaa7acc34254937 (patch) | |
tree | d7cb1cd499ab49df4366d776878a8137d662abe4 /js/panels/Timeline/Collapser.js | |
parent | 5c9795958b08c233eb2c4afab8054d55c3a33d98 (diff) | |
parent | 13f52cf0c74f53a919fa864f86669e8155f82961 (diff) | |
download | ninja-5c49635cc44815364f9a0296ffaa7acc34254937.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/panels/Timeline/Collapser.js')
-rw-r--r-- | js/panels/Timeline/Collapser.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/js/panels/Timeline/Collapser.js b/js/panels/Timeline/Collapser.js index 5de884a9..ad490c2e 100644 --- a/js/panels/Timeline/Collapser.js +++ b/js/panels/Timeline/Collapser.js | |||
@@ -184,6 +184,10 @@ var Montage = require("montage/core/core").Montage, | |||
184 | // Get the original value of the overflow property: | 184 | // Get the original value of the overflow property: |
185 | this._origOverflowValue = window.getComputedStyle(this.myContent, null).getPropertyValue("overflow"); | 185 | this._origOverflowValue = window.getComputedStyle(this.myContent, null).getPropertyValue("overflow"); |
186 | 186 | ||
187 | /* | ||
188 | * Removed because of expense. This disables the feature of having the | ||
189 | * component dynamically expand/collapse the content on init based on properties; | ||
190 | * Now default state of component must be set in CSS. | ||
187 | // If the content area is supposed to start out collapsed: | 191 | // If the content area is supposed to start out collapsed: |
188 | if (this.isCollapsed) { | 192 | if (this.isCollapsed) { |
189 | this.myContent.style.height = "0px"; | 193 | this.myContent.style.height = "0px"; |
@@ -198,6 +202,7 @@ var Montage = require("montage/core/core").Montage, | |||
198 | this.myContent.classList.remove(this.collapsedClass); | 202 | this.myContent.classList.remove(this.collapsedClass); |
199 | this.clicker.classList.remove(this.collapsedClass); | 203 | this.clicker.classList.remove(this.collapsedClass); |
200 | } | 204 | } |
205 | */ | ||
201 | } | 206 | } |
202 | }, | 207 | }, |
203 | draw: { | 208 | draw: { |