diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/MomentCtrl.js | 6 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/www/js/MomentCtrl.js b/www/js/MomentCtrl.js index 3ed6a49a..4a0d41ec 100644 --- a/www/js/MomentCtrl.js +++ b/www/js/MomentCtrl.js @@ -514,6 +514,8 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$ noBackdrop: true, duration: zm.loadingTimeout });*/ + + $scope.areImagesLoading = true; var progressCalled = false; var ld = NVRDataModel.getLogin(); @@ -536,6 +538,7 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$ NVRDataModel.debug("All images loaded"); $ionicLoading.hide(); + $scope.areImagesLoading = false; jiggleAway(); if (!progressCalled) { @@ -825,6 +828,7 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$ $scope.$on('$ionicView.beforeEnter', function () { $scope.showIcons = true; + $scope.areImagesLoading = true; $scope.expand = false; var ld = NVRDataModel.getLogin(); @@ -858,7 +862,7 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$ $scope.$on('$ionicView.afterEnter', function () { - + getMoments(momentType); diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 9d257d33..5c5fb5ca 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -157,7 +157,6 @@ angular.module('zmApp.controllers') //$ionicHistory.clearCache(); //$state.go('app.montage'); - console.log ("======HOPPAAAAA!!!========"+$state.current.name); /*$ionicHistory.clearCache([$state.current.name]).then(function() { $state.go('app.montage', $stateParams, {reload:true, inherit:false}); });*/ @@ -207,6 +206,8 @@ angular.module('zmApp.controllers') duration: zm.loadingTimeout });*/ + + $scope.areImagesLoading = true; var progressCalled = false; draggies = []; var layouttype = true; @@ -599,7 +600,7 @@ angular.module('zmApp.controllers') function loadNotifications() { if (multiPortZms) { - // console.log ("Skipping timer as multiportZMS="+multiPortZms); + // console.log ("Skipping timer as multiportZMS="+multiPortZms); return; } |