aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
diff options
context:
space:
mode:
authorJon Reid2012-03-21 11:37:48 -0700
committerJon Reid2012-03-21 11:37:48 -0700
commit3669eea4bde3518ce080048e9f53d2dd111fd8be (patch)
treed88892df558c080342a754351059c0d4a10beba2 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
parent9d7cd4d067b988a65cdea3059769617487028a22 (diff)
downloadninja-3669eea4bde3518ce080048e9f53d2dd111fd8be.tar.gz
Timeline: Bug fix: style collapsers not staying in synch. Also, removed console.log calls in hintable component.
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index e9a2115a..011d991e 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -672,8 +672,8 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
672 } else if (layerEvent.layerEventType === "newStyle") { 672 } else if (layerEvent.layerEventType === "newStyle") {
673 this.arrStyleTracks.push("1"); 673 this.arrStyleTracks.push("1");
674 if (this._styleCollapser.isCollapsed === true) { 674 if (this._styleCollapser.isCollapsed === true) {
675 this._styleCollapser.bypassAnimation = layerEvent.bypassAnimation; 675 //this._styleCollapser.bypassAnimation = layerEvent.bypassAnimation;
676 this._styleCollapser.handleCollapserLabelClick(); 676 //this._styleCollapser.handleCollapserLabelClick();
677 } 677 }
678 } else if (layerEvent.layerEventType === "deleteStyle") { 678 } else if (layerEvent.layerEventType === "deleteStyle") {
679 this.arrStyleTracks.pop(); 679 this.arrStyleTracks.pop();