summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2019-08-09 13:10:15 -0400
committerPliable Pixels <pliablepixels@gmail.com>2019-08-09 13:10:15 -0400
commit633e44f5dc42ee5f946c573d5eb6232a047acb44 (patch)
treef98ae76437067b418717d6ae61070b253f91ffb9
parent452e4487875a362b98f4dc99a5c34e9f18f7bfa8 (diff)
ver
-rw-r--r--config.xml5
-rw-r--r--package.json8
-rw-r--r--www/js/EventModalCtrl.js3
-rw-r--r--www/js/NVR.js2
4 files changed, 13 insertions, 5 deletions
diff --git a/config.xml b/config.xml
index 18c32d53..db2d77e1 100644
--- a/config.xml
+++ b/config.xml
@@ -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.070" 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.071" 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
@@ -175,4 +175,7 @@
<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>
</widget>
diff --git a/package.json b/package.json
index c41d6d92..d829b022 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "zmninjapro",
"description": "Home security mobile app for ZoneMinder",
- "version": "1.3.070",
+ "version": "1.3.071",
"displayName": "zmNinja",
"author": "Pliable Pixels",
"license": "custom see LICENSE.md",
@@ -56,7 +56,10 @@
"cordova-plugin-photo-library": {
"PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save monitor photos to albums "
},
- "cordova-plugin-media-pp-fork": {}
+ "cordova-plugin-media-pp-fork": {},
+ "cordova-plugin-ionic-webview": {
+ "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
+ }
}
},
"dependencies": {
@@ -81,6 +84,7 @@
"cordova-plugin-inappbrowser": "^1.7.2",
"cordova-plugin-insomnia": "^4.3.0",
"cordova-plugin-ionic-keyboard": "^2.1.3",
+ "cordova-plugin-ionic-webview": "git+https://github.com/pliablepixels/cordova-plugin-ionic-webview.git",
"cordova-plugin-media-pp-fork": "^1.0.2-dev",
"cordova-plugin-multi-window": "0.0.3",
"cordova-plugin-network-information": "^2.0.1",
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 852c3dc7..5905c484 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -1,3 +1,5 @@
+import { transcode } from "buffer";
+
// Common Controller for the montage view
/* jshint -W041 */
/* jslint browser: true*/
@@ -1946,7 +1948,6 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
function prepareModalEvent(eid) {
-
// Lets get the detailed event API
var loginData = NVR.getLogin();
var myurl = loginData.apiurl + '/events/' + eid + ".json?"+$rootScope.authSession;
diff --git a/www/js/NVR.js b/www/js/NVR.js
index 28768a73..e79878fb 100644
--- a/www/js/NVR.js
+++ b/www/js/NVR.js
@@ -21,7 +21,7 @@ angular.module('zmApp.controllers')
DO NOT TOUCH zmAppVersion
It is changed by sync_version.sh
*/
- var zmAppVersion = "1.3.070";
+ var zmAppVersion = "1.3.071";
var isBackground = false;
var justResumed = false;
var timeSinceResumed = -1;