diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2016-01-20 04:22:12 -0500 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2016-01-20 04:22:12 -0500 |
| commit | 1f411cadadc3e74cc6239204e583765bad382d92 (patch) | |
| tree | 2903f7c426689af6669382ee04c139edd579c87a /www | |
| parent | 5fd5d9f0b3c210f1f16a2b05fb567595b0b0cd59 (diff) | |
#139 - make sure timers to switch to nph-zms don't cascade when swiping fast
Former-commit-id: 72a6d0032df1524645609c4c64b9b62f88b717c4
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/ModalCtrl.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/www/js/ModalCtrl.js b/www/js/ModalCtrl.js index b22a2458..b2299068 100644 --- a/www/js/ModalCtrl.js +++ b/www/js/ModalCtrl.js @@ -9,6 +9,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco // from parent scope var currentEvent=$scope.currentEvent; + var nphTimer; var eventImageDigits = 5; // failsafe @@ -27,6 +28,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco $scope.showModalRangeSider = false; $scope.isModalActive = true; + $timeout(function () { $scope.showModalRangeSider = true; @@ -56,7 +58,8 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco // first 5 seconds, load a snapshot, then switch to real FPS display // this is to avoid initial image load delay // FIXME: 5 seconds fair? - $timeout( function() + $timeout.cancel(nphTimer); + nphTimer=$timeout( function() { $scope.currentStreamMode = 'jpeg'; ZMDataModel.zmLog ("Switching playback via nphzms"); @@ -558,7 +561,8 @@ $scope.togglePresets = function() // first 5 seconds, load a snapshot, then switch to real FPS display // this is to avoid initial image load delay // FIXME: 5 seconds fair? - $timeout( function() + $timeout.cancel(nphTimer); + nphTimer = $timeout( function() { $scope.currentStreamMode = 'jpeg'; ZMDataModel.zmLog ("Switching playback via nphzms"); |