various updates to lazy to document why

Former-commit-id: 21224eb61a2b5e060b38cca3bfd5e0ccb85f95d7

1 files changed, 8 insertions, 4 deletions

diff --git a/www/js/LogCtrl.js b/www/js/LogCtrl.js
index e9684ff8..2fde7129 100644
--- a/www/js/LogCtrl.js
+++ b/www/js/LogCtrl.js
@@ -2,7 +2,7 @@
 /* jslint browser: true*/
 /* global saveAs, cordova,StatusBar,angular,console,moment */
 
-angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$rootScope','zm', '$ionicModal', 'ZMDataModel', '$ionicSideMenuDelegate', '$fileLogger', '$cordovaEmailComposer', '$ionicPopup', '$timeout', '$ionicHistory', '$state', '$interval', function ($scope, $rootScope,zm, $ionicModal, ZMDataModel, $ionicSideMenuDelegate, $fileLogger, $cordovaEmailComposer, $ionicPopup, $timeout, $ionicHistory, $state, $interval) {
+angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$rootScope','zm', '$ionicModal', 'ZMDataModel', '$ionicSideMenuDelegate', '$fileLogger', '$cordovaEmailComposer', '$ionicPopup', '$timeout', '$ionicHistory', '$state', '$interval', '$ionicLoading', function ($scope, $rootScope,zm, $ionicModal, ZMDataModel, $ionicSideMenuDelegate, $fileLogger, $cordovaEmailComposer, $ionicPopup, $timeout, $ionicHistory, $state, $interval, $ionicLoading) {
     $scope.openMenu = function () {
         $ionicSideMenuDelegate.toggleLeft();
     };
@@ -152,17 +152,21 @@ saveAs(blob, fname);
     {
         //console.log ("GETTING LOGS");
         
+         $ionicLoading.show({
+                    template: "retrieving logs...",
+                    noBackdrop: true,
+                    duration: zm.loadingTimeout
+                });
         
         $fileLogger.getLogfile().then(function (l) {
 
                 
                 $scope.zmLog.logString = l.split('\n').reverse().join('\n');
-                //$scope.zmLog.logString = Math.random() + $scope.zmLog.logString;
-           // console.log ("UPDATING LOGS");
-                //console.log ("LOGS" + logstring);
+                $ionicLoading.hide();
             },
             function (error) {
                 $scope.zmLog.logString = "Error getting log: " + JSON.stringify(error);
+                $ionicLoading.hide();
             });
     }