From fcc1e457a997123133e713ba438e2c47843a090b Mon Sep 17 00:00:00 2001 From: = <=> Date: Thu, 7 Mar 2019 08:41:11 -0500 Subject: nits --- config.xml | 8 ++++---- electron_js/main.js | 2 +- package.json | 9 +++++---- www/js/StateCtrl.js | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/config.xml b/config.xml index f7b94e37..05638f16 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + zmNinja High performance ZoneMinder client @@ -173,10 +173,10 @@ - - - + + + diff --git a/electron_js/main.js b/electron_js/main.js index ecabe3de..ba107fee 100644 --- a/electron_js/main.js +++ b/electron_js/main.js @@ -283,7 +283,7 @@ app.on('activate', () => { }); console.log ("Setting uncaught exception handler..."); -app.on('uncaughtException', function (err) { +process.on('uncaughtException', function (err) { console.log("***WHOOPS TIME****"+err); }); diff --git a/package.json b/package.json index 55e1a966..101ec59b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version":"1.3.050", + "version": "1.3.050", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", @@ -57,10 +57,10 @@ "FCM_VERSION": "11.6.2" }, "cordova-custom-config": {}, - "cordova-plugin-media-pp-fork": {}, "cordova-plugin-ionic-webview": { "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" - } + }, + "cordova-plugin-media-pp-fork": {} } }, "dependencies": { @@ -99,6 +99,7 @@ "cordova-plugin-x-socialsharing": "^5.4.4", "cordova-sqlite-storage": "^1.5.3", "deep-equal": "^1.0.1", + "dialog": "^0.3.1", "electron-window-state": "^4.1.1", "es6-promise-plugin": "^4.2.2", "jsonfile": "^4.0.0", @@ -184,4 +185,4 @@ ] } } -} +} \ No newline at end of file diff --git a/www/js/StateCtrl.js b/www/js/StateCtrl.js index 1a40b8f5..0871c5ee 100644 --- a/www/js/StateCtrl.js +++ b/www/js/StateCtrl.js @@ -358,7 +358,7 @@ $scope.toggleServer = function() { $http.post(apiExec + str + ".json") .then( function (success) { - NVR.debug("StateCtrl/controlZM: returned success"); + NVR.debug("StateCtrl/controlZM: returned success with:"+JSON.stringify(success)); inProgress = 0; switch (str) { case "stop": -- cgit v1.2.3