From a032d9b8e20b56252f33f7ff0fdfc20f73ec5fba Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 18 Mar 2019 16:31:55 -0400 Subject: nits --- config.xml | 11 ++++------- package.json | 18 ++++++------------ www/js/LoginCtrl.js | 4 ++-- www/js/NVR.js | 2 +- 4 files changed, 13 insertions(+), 22 deletions(-) diff --git a/config.xml b/config.xml index 84ca2e00..719bbc73 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + zmNinja High performance ZoneMinder client @@ -144,7 +144,6 @@ - @@ -163,7 +162,6 @@ - @@ -172,11 +170,10 @@ - + + - - - + diff --git a/package.json b/package.json index 829fe13f..d42db99b 100644 --- a/package.json +++ b/package.json @@ -1,15 +1,12 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version":"1.3.053", + "version": "1.3.055", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", "cordova": { - "platforms": [ - "android", - "ios" - ], + "platforms": [], "plugins": { "cordova-plugin-add-swift-support": {}, "cordova-plugin-android-permissions": {}, @@ -26,7 +23,6 @@ "cordova-plugin-insomnia": {}, "cordova-plugin-pin-dialog": {}, "cordova-plugin-splashscreen": {}, - "cordova-plugin-websocket": {}, "cordova-plugin-whitelist": {}, "cordova-sqlite-storage": {}, "cordova-plugin-touch-id": { @@ -48,7 +44,6 @@ "PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save image alarms todisk" }, "cordova-plugin-advanced-http": {}, - "cordova-plugin-advanced-websocket": {}, "cordova-plugin-x-socialsharing": { "ANDROID_SUPPORT_V4_VERSION": "24.1.1+" }, @@ -57,21 +52,21 @@ "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": {} + "cordova-plugin-advanced-websocket": {} } }, "dependencies": { "clivas": "^0.2.0", "cordova-android": "7.1.4", "cordova-custom-config": "^5.0.2", - "cordova-ios": "5.0.0", "cordova-library-helper-pp-fork": "^1.0.1", "cordova-plugin-add-swift-support": "^1.7.2", "cordova-plugin-advanced-http": "git+https://github.com/silkimen/cordova-plugin-advanced-http.git", - "cordova-plugin-advanced-websocket": "^1.1.4", + "cordova-plugin-advanced-websocket": "1.1.5", "cordova-plugin-android-fingerprint-auth": "^1.5.0", "cordova-plugin-android-permissions": "^1.0.0", "cordova-plugin-app-version": "^0.1.9", @@ -94,7 +89,6 @@ "cordova-plugin-splashscreen": "^4.1.0", "cordova-plugin-statusbar": "^2.4.2", "cordova-plugin-touch-id": "^3.4.0", - "cordova-plugin-websocket": "^0.12.2", "cordova-plugin-whitelist": "^1.3.3", "cordova-plugin-x-socialsharing": "^5.4.4", "cordova-sqlite-storage": "^1.5.3", @@ -185,4 +179,4 @@ ] } } -} +} \ No newline at end of file diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index fef2c1ce..36eac47d 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -385,7 +385,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r else { mobilePinConfig(); } - } + }; function desktopPinConfig() { @@ -472,7 +472,7 @@ function mobilePinConfig () { } else { NVR.debug("Password disabled"); } - }; + } //------------------------------------------------------------------------------- // Makes input easier diff --git a/www/js/NVR.js b/www/js/NVR.js index b0330995..9b0e9f08 100644 --- a/www/js/NVR.js +++ b/www/js/NVR.js @@ -20,7 +20,7 @@ angular.module('zmApp.controllers') DO NOT TOUCH zmAppVersion It is changed by sync_version.sh */ - var zmAppVersion = "1.3.053"; + var zmAppVersion = "1.3.055"; var isBackground = false; var justResumed = false; var timeSinceResumed = -1; -- cgit v1.2.3