summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2019-06-16 08:56:53 -0400
committerPliable Pixels <pliablepixels@gmail.com>2019-06-16 08:56:53 -0400
commitc5708748958019fa4d0fa3b6355ef4444fb6ab14 (patch)
tree9519ae66281d9b19c86a61c2837cefb9404e2635
parent3e490ce2fc43a962565ff17f1987d67c7795e911 (diff)
nits
-rw-r--r--config.xml6
-rw-r--r--package.json6
-rw-r--r--www/js/NVR.js9
3 files changed, 14 insertions, 7 deletions
diff --git a/config.xml b/config.xml
index 3facf2e3..99546a05 100644
--- a/config.xml
+++ b/config.xml
@@ -172,10 +172,10 @@
<plugin name="cordova-plugin-photo-library" spec="https://github.com/nilebma/cordova-plugin-photo-library.git">
<variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value=" " />
</plugin>
- <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="5.0.0" />
+ <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>
</widget>
diff --git a/package.json b/package.json
index 2c6d771b..11a708d2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "zmninjapro",
"description": "Home security mobile app for ZoneMinder",
- "version": "1.3.061",
+ "version": "1.3.062",
"displayName": "zmNinja",
"author": "Pliable Pixels",
"license": "custom see LICENSE.md",
@@ -56,10 +56,10 @@
"cordova-plugin-photo-library": {
"PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save monitor photos to albums "
},
+ "cordova-plugin-media-pp-fork": {},
"cordova-plugin-ionic-webview": {
"ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
- },
- "cordova-plugin-media-pp-fork": {}
+ }
}
},
"dependencies": {
diff --git a/www/js/NVR.js b/www/js/NVR.js
index 86b1224f..7239c72a 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.061";
+ var zmAppVersion = "1.3.062";
var isBackground = false;
var justResumed = false;
var timeSinceResumed = -1;
@@ -123,6 +123,7 @@ angular.module('zmApp.controllers')
'eventServerInterval': '', // list of intervals for all monitors
'refreshSec': '2', // timer value for frame change in sec
'refreshSecLowBW': 8,
+ 'liveFPS':'',
'enableLogs': true,
'enableDebug': true, // if enabled with log messages with "debug"
'usePin': false,
@@ -1228,6 +1229,12 @@ angular.module('zmApp.controllers')
}
+ if (typeof loginData.liveFPS == 'undefined') {
+
+ loginData.liveFPS = '';
+
+ }
+
if (typeof loginData.disableAlarmCheckMontage == 'undefined') {
loginData.disableAlarmCheckMontage = false;