diff options
| -rw-r--r-- | config.xml | 6 | ||||
| -rw-r--r-- | package.json | 8 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 29 | ||||
| -rw-r--r-- | www/js/NVR.js | 2 |
4 files changed, 25 insertions, 20 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.065" 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.066" 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,7 +173,9 @@ <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value=" " /> </plugin> <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" /> - <plugin name="cordova-plugin-certificates-pp-fork" spec="^0.9.1" /> <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 9ea73e13..434a9767 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version": "1.3.065", + "version": "1.3.066", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", @@ -57,7 +57,9 @@ "PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save monitor photos to albums " }, "cordova-plugin-media-pp-fork": {}, - "cordova-plugin-certificates-pp-fork": {} + "cordova-plugin-ionic-webview": { + "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" + } } }, "dependencies": { @@ -72,7 +74,6 @@ "cordova-plugin-android-fingerprint-auth": "^1.5.0", "cordova-plugin-android-permissions": "^1.0.0", "cordova-plugin-app-version": "^0.1.9", - "cordova-plugin-certificates-pp-fork": "^0.9.1", "cordova-plugin-cloud-settings": "^1.0.4", "cordova-plugin-customurlscheme": "^4.4.0", "cordova-plugin-device": "^2.0.2", @@ -83,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/MontageCtrl.js b/www/js/MontageCtrl.js index 9353dbe1..c2bc8d3b 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -441,22 +441,23 @@ angular.module('zmApp.controllers') } NVR.debug("All images loaded, doing image layout"); - - } - $timeout(function () { - //NVR.log("Force calling resize"); - ///pckry.reloadItems(); - ///positions is defined only if layouttype was false - //(">>> Positions is " + JSON.stringify(positions)); - if (!layouttype && positions) pckry.initShiftLayout(positions, "data-item-id"); - // now do a jiggle $timeout(function () { - NVR.debug("inside drag items:doing the jiggle and dance..."); - pckry.shiftLayout(); - //$scope.squeezeMonitors(); - }, 500); + //NVR.log("Force calling resize"); + ///pckry.reloadItems(); + ///positions is defined only if layouttype was false + //(">>> Positions is " + JSON.stringify(positions)); + if (!layouttype && positions) pckry.initShiftLayout(positions, "data-item-id"); + // now do a jiggle + $timeout(function () { + NVR.debug("inside drag items:doing the jiggle and dance..."); + pckry.shiftLayout(); + //$scope.squeezeMonitors(); + }, 500); + + }, 100); - }, 100); + } + //pckry.onresize(); diff --git a/www/js/NVR.js b/www/js/NVR.js index 7ff298dc..6f9fad88 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.065"; + var zmAppVersion = "1.3.066"; var isBackground = false; var justResumed = false; var timeSinceResumed = -1; |