diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/DataModel.js | 4 | ||||
| -rw-r--r-- | www/js/LogCtrl.js | 100 | ||||
| -rwxr-xr-x | www/js/app.js | 10 |
3 files changed, 52 insertions, 62 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index d3a48fcd..17e2a688 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -967,8 +967,8 @@ angular.module('zmApp.controllers') if (exists) { log("A cloud configuration has been found"); window.cordova.plugin.cloudsettings.load(function (cloudData) { - console.log("CLOUD DATA FOUND" + JSON.stringify(cloudData)); - debug("Cloud data retrieved is:" + JSON.stringify(cloudData)); + //console.log("CLOUD DATA FOUND" + JSON.stringify(cloudData)); + // debug("Cloud data retrieved is:" + JSON.stringify(cloudData)); if (cloudData && cloudData.defaultServerName && cloudData.serverGroupList) { log("retrieved a valid cloud config with a defaultServerName of:" + cloudData.defaultServerName); log("replacing local DB with cloud..."); diff --git a/www/js/LogCtrl.js b/www/js/LogCtrl.js index e87b8034..38cd3464 100644 --- a/www/js/LogCtrl.js +++ b/www/js/LogCtrl.js @@ -104,55 +104,45 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo }; - $scope.attachLogs = function() { - - - - var body = "zmNinja version:" + $scope.zmAppVersion + - " (" + $rootScope.platformOS + ")<br/>" + - "ZoneMinder version:" + NVRDataModel.getCurrentServerVersion(); - - - body = '<b>'+$translate.instant('kSensitiveBody')+'</b><br/><br/>'+body; - - - $fileLogger.checkFile() - .then (function (d) { - - var url = cordova.file.dataDirectory + d.name; - //url = url.replace("file://",""); - console.log ( "URL:"+url); - NVRDataModel.log ( "URL:"+url); - - - var onSuccess = function(result) { - NVRDataModel.log("Share completed? " + result.completed); // On Android apps mostly return false even while it's true - NVRDataModel.log("Shared to app: " + result.app); // On Android result.app since plugin version 5.4.0 this is no longer empty. On iOS it's empty when sharing is cancelled (result.completed=false) - }; - - var onError = function(msg) { - NVRDataModel.log("Sharing failed with message: " + msg); - }; - - window.plugins.socialsharing.shareViaEmail( - body, //body - 'zmNinja Logs attached', // subject - [zm.authoremail], //to - null, // cc - null, //bcc - [url], - onSuccess, - onError - ); - + // picks up applogs on the FS and sends an email with it + + $scope.attachLogs = function () { + var body = "zmNinja version:" + $scope.zmAppVersion + + " (" + $rootScope.platformOS + ")<br/>" + + "ZoneMinder version:" + NVRDataModel.getCurrentServerVersion(); + body = '<b>' + $translate.instant('kSensitiveBody') + '</b><br/><br/>' + body; + + $fileLogger.checkFile() + .then(function (d) { + var fileWithPath = cordova.file.dataDirectory + d.name; + NVRDataModel.log("file location:" + fileWithPath); + + var onSuccess = function (result) { + NVRDataModel.log("Share completed? " + result.completed); + NVRDataModel.log("Shared to app: " + result.app); + }; + + var onError = function (msg) { + NVRDataModel.log("Sharing failed with message: " + msg); + }; + + window.plugins.socialsharing.shareViaEmail( + body, //body + 'zmNinja Logs attached', // subject + [zm.authoremail], //to + null, // cc + null, //bcc + [fileWithPath], + onSuccess, + onError + ); + }, + function (e) { + NVRDataModel.debug("Error attaching log file:" + JSON.stringify(e)); + }); - }, - function (e) { - NVRDataModel.debug ("Error attaching log file:"+JSON.stringify(e)); - }); - }; //-------------------------------------------------------------------------- // Convenience function to send logs via email @@ -175,7 +165,7 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo var urlNoProtocol = loginData.url.replace(/.*?:\/\//, ""); if (urlNoProtocol != "") { var re2 = new RegExp(urlNoProtocol, "g"); - + logstring = logstring.replace(re2, "<server>"); } urlNoProtocol = loginData.streamingurl.replace(/.*?:\/\//, ""); @@ -309,22 +299,22 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo // reset power state on exit as if it is called after we enter another // state, that effectively overwrites current view power management needs //------------------------------------------------------------------------ - - + + $scope.$on('$ionic.beforeEnter', function () { - $scope.$on ( "process-push", function () { - NVRDataModel.debug (">> LogCtrl: push handler"); + $scope.$on("process-push", function () { + NVRDataModel.debug(">> LogCtrl: push handler"); var s = NVRDataModel.evaluateTappedNotification(); - NVRDataModel.debug("tapped Notification evaluation:"+ JSON.stringify(s)); + NVRDataModel.debug("tapped Notification evaluation:" + JSON.stringify(s)); $ionicHistory.nextViewOptions({ - disableAnimate:true, + disableAnimate: true, disableBack: true }); - $state.go(s[0],s[1],s[2]); + $state.go(s[0], s[1], s[2]); }); }); - + $scope.$on('$ionicView.enter', function () { //console.log("**VIEW ** Log Ctrl Entered"); diff --git a/www/js/app.js b/www/js/app.js index 69c1c6bc..332c4613 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -1689,7 +1689,7 @@ angular.module('zmApp', [ NVRDataModel.log ("--------->Setting up network state handlers...."); document.addEventListener("offline", onOffline, false); - document.addEventListener("online", onOffline, false); + document.addEventListener("online", onOnline, false); },3000); @@ -2205,8 +2205,8 @@ angular.module('zmApp', [ NVRDataModel.log("App is resuming from background"); NVRDataModel.log ("-->Re-registering online/offine"); - document.addEventListener("offline", onOnline, false); - document.addEventListener("online", onOffline, false); + document.addEventListener("offline", onOffline, false); + document.addEventListener("online", onOnline, false); $rootScope.isDownloading = false; @@ -2258,8 +2258,8 @@ angular.module('zmApp', [ function pauseHandler() { NVRDataModel.log ("-->Clearing online/offine"); - document.removeEventListener("offline", onOnline, false); - document.removeEventListener("online", onOffline, false); + document.removeEventListener("offline", onOffline, false); + document.removeEventListener("online", onOnline, false); NVRDataModel.setBackground(true); NVRDataModel.setJustResumed(false); |