Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

  • Loading branch information...
commit 77dcd6ca540122a50ca7b78e5da0e811e8d3c50f 2 parents a209375 + 2a000a3
@kring kring authored
View
1  Apps/TimelineDemo/TimelineDemo.js
@@ -101,7 +101,6 @@ define(['dojo',
function tick() {
var time = clock.tick();
- timeline.updateFromClock();
updateScrubTime(time);
requestAnimationFrame(tick);
}
View
1  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.
View
4 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) {
Please sign in to comment.
Something went wrong with that request. Please try again.