Merge remote-tracking branch 'origin/master' into oneTexturePerLayer

CesiumGS · Feb 28, 2013 · 77dcd6c · 77dcd6c
2 parents a209375 + 2a000a3
commit 77dcd6c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/Apps/TimelineDemo/TimelineDemo.js b/Apps/TimelineDemo/TimelineDemo.js
@@ -101,7 +101,6 @@ define(['dojo',
 
         function tick() {
             var time = clock.tick();
-            timeline.updateFromClock();
             updateScrubTime(time);
             requestAnimationFrame(tick);
         }

diff --git a/Source/Widgets/Dojo/CesiumViewerWidget.js b/Source/Widgets/Dojo/CesiumViewerWidget.js
@@ -1063,7 +1063,6 @@ define([
             } else {
                 currentTime = this.clock.currentTime;
             }
-            this.timeline.updateFromClock();
             this.visualizers.update(currentTime);
 
             // Update the camera to stay centered on the selected object, if any.

diff --git a/Source/Widgets/Timeline/Timeline.js b/Source/Widgets/Timeline/Timeline.js
@@ -75,6 +75,7 @@ define([
         } else {
             this._topElement = id;
         }
+
         this._clock = clock;
         this._scrubJulian = clock.currentTime;
         this._mainTicSpan = -1;
@@ -138,6 +139,9 @@ define([
         this.addEventListener = function(type, listener, useCapture) {
             widget._topElement.addEventListener(type, listener, useCapture);
         };
+
+        clock.onTick.addEventListener(this.updateFromClock, this);
+        this.updateFromClock();
     }
 
     Timeline.prototype.addHighlightRange = function(color, heightInPx) {