summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-12-10 11:18:48 -0500
committerPliable Pixels <pliablepixels@gmail.com>2018-12-10 11:18:48 -0500
commit79f9a863483d0be642fe293790c5ba17451ef516 (patch)
treefa596a8da3893b3e3ae2212faa4acdee1748920d
parent258f6666b0e268689356454731e27973d8363c47 (diff)
version
-rw-r--r--config.xml6
-rw-r--r--package.json8
-rw-r--r--www/js/MontageCtrl.js2
3 files changed, 9 insertions, 7 deletions
diff --git a/config.xml b/config.xml
index d48de564..37e1f952 100644
--- a/config.xml
+++ b/config.xml
@@ -163,10 +163,10 @@
<plugin name="cordova-plugin-advanced-websocket" spec="^1.1.3" />
<plugin name="cordova-plugin-network-information" spec="^2.0.1" />
<plugin name="cordova-plugin-x-socialsharing" spec="^5.4.1" />
- <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" />
- <engine name="android" spec="^6.4.0" />
- <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="^6.4.0" />
+ <engine name="ios" spec="~4.5.5" />
</widget>
diff --git a/package.json b/package.json
index 592fc815..9e13e5ef 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "zmninjapro",
"description": "Home security mobile app for ZoneMinder",
- "version":"1.3.035",
+ "version": "1.3.035",
"displayName": "zmNinja",
"author": "Pliable Pixels",
"license": "custom see LICENSE.md",
@@ -50,10 +50,10 @@
},
"cordova-plugin-advanced-websocket": {},
"cordova-plugin-x-socialsharing": {},
- "cordova-plugin-media-pp-fork": {},
"cordova-plugin-ionic-webview": {
"ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
- }
+ },
+ "cordova-plugin-media-pp-fork": {}
}
},
"dependencies": {
@@ -176,4 +176,4 @@
]
}
}
-}
+} \ No newline at end of file
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 90d9ee82..3ff8d85d 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -1768,6 +1768,8 @@ angular.module('zmApp.controllers')
}
$scope.processImageError = function(monitor) {
+ // NVRDataModel.debug ("Image load error for: "+monitor.Monitor.Id+" regenerated connKey is:"+monitor.Monitor.connKey);
+ //if (1) return; // REMOVE
monitor.Monitor.connKey = (Math.floor((Math.random() * 999999) + 1)).toString();
NVRDataModel.debug ("Image load error for: "+monitor.Monitor.Id+" regenerated connKey is:"+monitor.Monitor.connKey);
};