diff options
author | Jon Reid | 2012-03-21 15:40:33 -0700 |
---|---|---|
committer | Jon Reid | 2012-03-21 15:40:33 -0700 |
commit | 2d9cb9ca8f6beb661a3d904b5125afa8243661de (patch) | |
tree | 99a76e567aa910ebfee27ae58f257e7551ab5c09 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |
parent | 3669eea4bde3518ce080048e9f53d2dd111fd8be (diff) | |
download | ninja-2d9cb9ca8f6beb661a3d904b5125afa8243661de.tar.gz |
Timeline: First integration of drag and drop of layers.
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index 011d991e..40af9af6 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -655,27 +655,11 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
655 | if (layerEvent.layerID !== this.trackID) { | 655 | if (layerEvent.layerID !== this.trackID) { |
656 | return; | 656 | return; |
657 | } | 657 | } |
658 | if (layerEvent.layerEventType === "labelClick") { | 658 | if (layerEvent.layerEventType === "newStyle") { |
659 | if (layerEvent.layerEventLocale === "content-main") { | 659 | // TODO: Add a real track of tweens. Probably need a method for that. |
660 | this._mainCollapser.bypassAnimation = layerEvent.bypassAnimation; | ||
661 | this._mainCollapser.toggle(); | ||
662 | } else if (layerEvent.layerEventLocale === "content-position") { | ||
663 | this._positionCollapser.bypassAnimation = layerEvent.bypassAnimation; | ||
664 | this._positionCollapser.handleCollapserLabelClick(); | ||
665 | } else if (layerEvent.layerEventLocale === "content-transform") { | ||
666 | this._transformCollapser.bypassAnimation = layerEvent.bypassAnimation; | ||
667 | this._transformCollapser.handleCollapserLabelClick(); | ||
668 | } else if (layerEvent.layerEventLocale === "content-style") { | ||
669 | this._styleCollapser.bypassAnimation = layerEvent.bypassAnimation; | ||
670 | this._styleCollapser.handleCollapserLabelClick(); | ||
671 | } | ||
672 | } else if (layerEvent.layerEventType === "newStyle") { | ||
673 | this.arrStyleTracks.push("1"); | 660 | this.arrStyleTracks.push("1"); |
674 | if (this._styleCollapser.isCollapsed === true) { | ||
675 | //this._styleCollapser.bypassAnimation = layerEvent.bypassAnimation; | ||
676 | //this._styleCollapser.handleCollapserLabelClick(); | ||
677 | } | ||
678 | } else if (layerEvent.layerEventType === "deleteStyle") { | 661 | } else if (layerEvent.layerEventType === "deleteStyle") { |
662 | // TODO: Delete the right track. Index can be passed in event object, use that for splice(). | ||
679 | this.arrStyleTracks.pop(); | 663 | this.arrStyleTracks.pop(); |
680 | } | 664 | } |
681 | } | 665 | } |