diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/EventCtrl.js | 4 | ||||
| -rw-r--r-- | www/js/EventModalCtrl.js | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index eed6bc44..b195d6eb 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -2694,6 +2694,8 @@ angular.module('zmApp.controllers') }); } + + //-------------------------------------------------------- //We need to destroy because we are instantiating // it on open @@ -2708,7 +2710,7 @@ angular.module('zmApp.controllers') } } - + $ionicLoading.hide(); NVR.setAwake(false); if ($scope.modal !== undefined) { $scope.modal.remove(); diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index 37210c22..2cc08bf7 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -245,14 +245,14 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro } } - $ionicLoading.show({ - template: "<ion-spinner icon='ripple' class='spinner-energized'></ion-spinner><br/>" + $translate.instant('kVideoLoading') + "...", - - }); - + + $scope.isVideoLoading = true; + }; + + $scope.onPlaybackUpdate = function (rate) { @@ -274,6 +274,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro $scope.onCanPlay = function () { $ionicLoading.hide(); + $scope.isVideoLoading = false; NVR.debug("This video can be played"); var rate = NVR.getLogin().videoPlaybackSpeed; @@ -1092,7 +1093,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro $scope.alarm_images = []; $scope.snapshotFrameId = 1; currentStreamState = streamState.STOPPED; - + $scope.isVideoLoading = false; }); @@ -1110,6 +1111,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro $scope.$on('modal.shown', function (e, m) { + $scope.isVideoLoading = false; $scope.displayControls = true; $ionicLoading.hide(); if (m.id != 'footage') |