diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-05 14:22:38 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-05 14:22:38 -0400 |
| commit | f2619f2c04203ac3a56bf0ac914149df5616ef49 (patch) | |
| tree | 8bfca27b51dfcd9666897db2c32236185b2b8eb2 /www/js/MontageCtrl.js | |
| parent | 6fe8b88916291e62360217ee23829d4c0db592aa (diff) | |
added non-obstructing loading indicator for montage and moment
Diffstat (limited to 'www/js/MontageCtrl.js')
| -rw-r--r-- | www/js/MontageCtrl.js | 5 |
1 files changed, 3 insertions, 2 deletions
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; } |