From 82b321b3f9ce1ca89a2c6e991c9ef91f4b14fd4a Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 27 Oct 2015 10:27:54 -0700 Subject: [PATCH] [Time Conductor] Update displayed text when format changes --- .../src/controllers/TimeRangeController.js | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/platform/commonUI/general/src/controllers/TimeRangeController.js b/platform/commonUI/general/src/controllers/TimeRangeController.js index 97bb05e71f..ce53b7b1e7 100644 --- a/platform/commonUI/general/src/controllers/TimeRangeController.js +++ b/platform/commonUI/general/src/controllers/TimeRangeController.js @@ -267,20 +267,15 @@ define( } } - function reinitializeBounds(now, increment) { - var end = Math.ceil(now / increment) * increment, - start = end - increment; - $scope.ngModel.outer.start = start; - $scope.ngModel.outer.end = end; - $scope.ngModel.inner.start = start; - $scope.ngModel.inner.end = end; - $scope.boundsModel = {}; - updateViewFromModel($scope.ngModel); - } - function updateFormat(key) { formatter = formatService.getFormat(key) || formatService.getFormat(DEFAULT_FORMAT); + + // Assume that start/end are still valid, but clear + // the displayed text for bounds, since this will + // now be formatted differently. + $scope.boundsModel = {}; + updateViewFromModel($scope.ngModel); } function updateStartFromPicker(value) {