diff options
| author | Jonathan Duran | 2012-05-25 14:09:33 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-25 14:09:33 -0700 |
| commit | 5743d386408da3810c25e4a34e6829cac47cab06 (patch) | |
| tree | 44dc57c22a29d266f491c13c1b5c8d9c55b02182 /js/panels/Timeline/TimelineTrack.reel | |
| parent | 6808427d3c0defa9f00884711b316f4e76ac54fc (diff) | |
| parent | b0a736deb4f3bb515e0ca4009fe4f98e22cec2c0 (diff) | |
| download | ninja-5743d386408da3810c25e4a34e6829cac47cab06.tar.gz | |
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel')
| -rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index f90e10c2..835fc785 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
| @@ -967,9 +967,6 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
| 967 | restoredStyleTrack.propTrackData.styleIndex = layerEvent.styleIndex; | 967 | restoredStyleTrack.propTrackData.styleIndex = layerEvent.styleIndex; |
| 968 | 968 | ||
| 969 | this.arrStyleTracks.push(restoredStyleTrack); | 969 | this.arrStyleTracks.push(restoredStyleTrack); |
| 970 | |||
| 971 | this.isStyleCollapsed = true; | ||
| 972 | this.triggerOutgoingBinding(); | ||
| 973 | } | 970 | } |
| 974 | else if (layerEvent.layerEventType === "deleteStyle") { | 971 | else if (layerEvent.layerEventType === "deleteStyle") { |
| 975 | // TODO: Delete the right track. Index can be passed in event object, use that for splice(). | 972 | // TODO: Delete the right track. Index can be passed in event object, use that for splice(). |