aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
diff options
context:
space:
mode:
authorJonathan Duran2012-02-08 16:12:58 -0800
committerJonathan Duran2012-02-08 16:12:58 -0800
commita8c16ca440b8ded3b78b59c767539e8c080680e7 (patch)
treeb95c8cbbd67051d8a4600d9d957106f733feb52b /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
parent43dde98b9a2440097a6c237d5cec8a36bc64cbdf (diff)
downloadninja-a8c16ca440b8ded3b78b59c767539e8c080680e7.tar.gz
Squashed commit of the following:
commit 46292bddbfbe7415c6852142dd10fd02a276722a Author: Jon Reid <tjh487@motorola.com> Date: Wed Feb 8 14:32:22 2012 -0800 Timeline: turn off console logging. commit b8de88393182bc6e819c3d6a290ade2f804236ac Merge: e651344 37b952c Author: Jon Reid <tjh487@motorola.com> Date: Wed Feb 8 14:10:06 2012 -0800 Merge branch 'Timeline-jduran' into Timeline-jreid commit e651344d5d6c2911b31a54510c65a349c4d52db2 Author: Jon Reid <tjh487@motorola.com> Date: Wed Feb 8 14:08:25 2012 -0800 Timeline: Bug fixes IKNINJA-947: Weird behavior with adding layers with an empty layer name selected IKNINJA-990: Multiple styles can be highlighted at the same time even when they are under different layers IKNINJA-1063: Styles can be added while style column is collapsed IKNINJA-970: When there is no style added yet, the arrow sign should be in a collapsed mode Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js7
1 files changed, 7 insertions, 0 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 5b1354d2..ae7eb001 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -414,6 +414,13 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
414 this._styleCollapser.handleCollapserLabelClick(); 414 this._styleCollapser.handleCollapserLabelClick();
415 } 415 }
416 } 416 }
417 /*
418 if (layerEvent.layerEventType === "newStyle") {
419 var newDiv = document.createElement("div");
420 newDiv.classList.add("timeline-track");
421 this.contentStyles.appendChild(newDiv);
422 }
423 */
417 } 424 }
418 } 425 }
419}); \ No newline at end of file 426}); \ No newline at end of file