diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-06-20 12:16:35 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-06-20 12:16:35 -0400 |
| commit | e998699d10fa8d9aff45713ad072d47ea15d99fd (patch) | |
| tree | fa0bc99344d62e1b023746e44d371de933569fa1 /www | |
| parent | 2b4d4fb36c31edf197cc4c30eaef766ebed57e84 (diff) | |
make sure montage timeNow is updated even if simulStreaming
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/MontageCtrl.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 1f29a253..b2021920 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -603,6 +603,13 @@ angular.module('zmApp.controllers') //----------------------------------------------------------------------- function loadNotifications() { + + if ($scope.iconTimeNow == 'local') + $scope.timeNow = moment().format(NVRDataModel.getTimeFormatSec()); + else + $scope.timeNow = moment().tz(NVRDataModel.getTimeZoneNow()).format(NVRDataModel.getTimeFormatSec()); + + if (simulStreaming) { // console.log ("Skipping timer as simulStreaming"); return; @@ -621,10 +628,7 @@ angular.module('zmApp.controllers') // if you see the time move, montage should move - if ($scope.iconTimeNow == 'local') - $scope.timeNow = moment().format(NVRDataModel.getTimeFormatSec()); - else - $scope.timeNow = moment().tz(NVRDataModel.getTimeZoneNow()).format(NVRDataModel.getTimeFormatSec()); + //$scope.timeNow = moment().format(NVRDataModel.getTimeFormatSec()); //console.log ("Inside Montage timer..."); |