diff options
| author | = <=> | 2019-03-07 08:41:11 -0500 |
|---|---|---|
| committer | = <=> | 2019-03-07 08:41:11 -0500 |
| commit | fcc1e457a997123133e713ba438e2c47843a090b (patch) | |
| tree | 701fbf8773f1403761b82cfda6a63ccf0105323e | |
| parent | 827f65abaaadf8a62518ba629f2e056de85c149a (diff) | |
nits
| -rw-r--r-- | config.xml | 8 | ||||
| -rw-r--r-- | electron_js/main.js | 2 | ||||
| -rw-r--r-- | package.json | 9 | ||||
| -rw-r--r-- | www/js/StateCtrl.js | 2 |
4 files changed, 11 insertions, 10 deletions
@@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.050" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.051" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <name>zmNinja</name> <description> High performance ZoneMinder client @@ -173,10 +173,10 @@ </plugin> <plugin name="cordova-custom-config" spec="5.0.2" /> <plugin name="cordova-plugin-advanced-http" spec="https://github.com/silkimen/cordova-plugin-advanced-http.git" /> - <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" /> - <engine name="android" spec="7.1.4" /> - <engine name="ios" spec="4.5.5" /> <plugin name="cordova-plugin-ionic-webview" spec="https://github.com/pliablepixels/cordova-plugin-ionic-webview.git"> <variable name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" value="27.+" /> </plugin> + <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" /> + <engine name="android" spec="7.1.4" /> + <engine name="ios" spec="4.5.5" /> </widget> 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": |
