From 087171accc59c43a1767d6bf75ec97a733c7889a Mon Sep 17 00:00:00 2001 From: Torry Brelsford Date: Fri, 26 Oct 2018 08:24:36 -0600 Subject: [PATCH] feat(timeline): Update timeline on most recent menu selection THIN-10690 --- src/os/layer/vector.js | 1 + src/os/ui/datetime/datecontrol.js | 4 +--- src/os/ui/timeline/timeline.js | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/os/layer/vector.js b/src/os/layer/vector.js index 807ae643e..093f40979 100644 --- a/src/os/layer/vector.js +++ b/src/os/layer/vector.js @@ -777,6 +777,7 @@ os.layer.Vector.prototype.callAction = function(type) { } } } + os.ui.timeline.TimelineCtrl.setView(); break; case os.action.EventType.REFRESH: if (source instanceof os.source.Request) { diff --git a/src/os/ui/datetime/datecontrol.js b/src/os/ui/datetime/datecontrol.js index f3112f9ff..974346496 100644 --- a/src/os/ui/datetime/datecontrol.js +++ b/src/os/ui/datetime/datecontrol.js @@ -348,7 +348,5 @@ os.ui.datetime.DateControlCtrl.prototype.getUIEndDate = function() { * @private */ os.ui.datetime.DateControlCtrl.prototype.onTimelineReset_ = function(event) { - if (!this['disabled']) { - this.update(); - } + this.update(); }; diff --git a/src/os/ui/timeline/timeline.js b/src/os/ui/timeline/timeline.js index 54aad98fa..4d4279648 100644 --- a/src/os/ui/timeline/timeline.js +++ b/src/os/ui/timeline/timeline.js @@ -1586,6 +1586,20 @@ os.ui.timeline.TimelineCtrl.prototype.brushCollectionChanged_ = function(brushes }; +/** + * Set the timeline view to the load range. + * + */ +os.ui.timeline.TimelineCtrl.setView = function() { + var tlc = os.time.TimelineController.getInstance(); + var tlScope = angular.element('.c-svg-timeline').scope(); + if (tlScope && tlScope['timeline']) { + var timeline = /** @type {os.ui.timeline.TimelineCtrl} */ (tlScope['timeline']); + timeline.zoomToExtent([tlc.getStart(), tlc.getEnd()]); + } +}; + + // the timeline should be exempt from right-click prevention os.events.addExemption( /**