added non-obstructing loading indicator for montage and moment

1 files changed, 5 insertions, 1 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);