aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorJon Reid2012-02-07 11:51:01 -0800
committerJon Reid2012-02-07 11:51:01 -0800
commite247f0c9bd596f0aeba6f6239ea9bd4178f5d50d (patch)
treed8b7f08969db064c8fc92b2698057d7cea854cd6 /js/panels
parent156b0648c6b046f74303221ce632a49fb28c9a8a (diff)
downloadninja-e247f0c9bd596f0aeba6f6239ea9bd4178f5d50d.tar.gz
Timeline: fix linked scrolling between tracks and layers (vertical) and tracks and time markers (horizontal).
Diffstat (limited to 'js/panels')
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js11
1 files changed, 8 insertions, 3 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 0dbcfa16..e0825893 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -145,6 +145,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
145 // Initialize the timeline 145 // Initialize the timeline
146 initTimelineView : { 146 initTimelineView : {
147 value:function(){ 147 value:function(){
148
149 // Get some selectors to make life easier.
150 this.layout_tracks = this.element.querySelector(".layout-tracks");
151 this.layout_markers = this.element.querySelector(".layout_markers");
148 152
149 // Add event handlers on the buttons. 153 // Add event handlers on the buttons.
150 this.newlayer_button.identifier = "addLayer"; 154 this.newlayer_button.identifier = "addLayer";
@@ -153,7 +157,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
153 this.deletelayer_button.addEventListener("click", this, false); 157 this.deletelayer_button.addEventListener("click", this, false);
154 158
155 // Simultaneous scrolling of the layer and tracks 159 // Simultaneous scrolling of the layer and tracks
156 this.layer_tracks.addEventListener("scroll", this.updateLayerScroll.bind(this), false); 160 this.layout_tracks.addEventListener("scroll", this.updateLayerScroll.bind(this), false);
157 this.user_layers.addEventListener("scroll", this.updateLayerScroll.bind(this), false); 161 this.user_layers.addEventListener("scroll", this.updateLayerScroll.bind(this), false);
158 162
159 // Calculate and draw time markers 163 // Calculate and draw time markers
@@ -172,8 +176,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
172 176
173 updateLayerScroll:{ 177 updateLayerScroll:{
174 value:function(){ 178 value:function(){
175 this.user_layers.scrollTop = this.layer_tracks.scrollTop; 179 console.log(this.layout_tracks.scrollLeft)
176 this.master_track.scrollLeft = this.layer_tracks.scrollLeft; 180 this.user_layers.scrollTop = this.layout_tracks.scrollTop;
181 this.layout_markers.scrollLeft = this.layout_tracks.scrollLeft;
177 } 182 }
178 }, 183 },
179 184