From 49b9108c84d8ba10bfaaadf148b1ea7164938784 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Wed, 1 Jul 2020 10:12:26 -0400
Subject: ver

---
 config.xml            |  3 +++
 package.json          |  8 ++++++--
 www/js/MonitorCtrl.js | 13 ++++++-------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/config.xml b/config.xml
index 93f125ec..487f9016 100644
--- a/config.xml
+++ b/config.xml
@@ -185,6 +185,9 @@
     <plugin name="cordova-plugin-app-version" spec="0.1.9" />
     <plugin name="cordova-plugin-inappbrowser" spec="https://github.com/apache/cordova-plugin-inappbrowser.git" />
     <plugin name="cordova-plugin-whitelist" spec="^1.3.4" />
+    <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="^8.0.0" />
     <engine name="ios" spec="^4.5.5" />
diff --git a/package.json b/package.json
index 66846c2b..a20df5bb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "zmninjapro",
   "description": "Home security mobile app for ZoneMinder",
-  "version":"1.4.008",
+  "version": "1.4.008",
   "displayName": "zmNinja",
   "author": "Pliable Pixels",
   "license": "custom see LICENSE.md",
@@ -62,6 +62,9 @@
       "cordova-plugin-app-version": {},
       "cordova-plugin-statusbar-pp-fork": {},
       "cordova-plugin-statusbar": {},
+      "cordova-plugin-ionic-webview": {
+        "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
+      },
       "cordova-plugin-media-pp-fork": {}
     }
   },
@@ -88,6 +91,7 @@
     "cordova-plugin-inappbrowser": "git+https://github.com/apache/cordova-plugin-inappbrowser.git",
     "cordova-plugin-insomnia": "^4.3.0",
     "cordova-plugin-ionic-keyboard": "^2.2.0",
+    "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.2",
@@ -229,4 +233,4 @@
       ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js
index 637998df..49df2435 100644
--- a/www/js/MonitorCtrl.js
+++ b/www/js/MonitorCtrl.js
@@ -157,13 +157,12 @@ angular.module('zmApp.controllers')
         $rootScope.zmPopup = $ionicPopup.show({
           scope: $scope,
           cssClass:'widepopup',
-          template: '<ion-toggle ng-model="monfunc.myenabled"   toggle-class="toggle-calm">'
-                    +$translate.instant('kMotionEnabled')+'</ion-toggle>'
-                    +'<ion-toggle ng-model="forceMjpeg.value"   toggle-class="toggle-calm">'
-                    +$translate.instant('kForceMjpeg')+'</ion-toggle>'+
-                    '<div class="item item-divider" style="background:#666666;color:white;">'
-                    +$translate.instant('kChangeMode')
-                    +'</div><ion-radio-fix ng-repeat="item in monFunctions" ng-value="item.value" ng-model="monfunc.myfunc"> {{item.text}} </ion-radio-fix>',
+          template: '<ion-toggle ng-model="monfunc.myenabled"   toggle-class="toggle-calm">'+
+                    $translate.instant('kMotionEnabled')+'</ion-toggle>'+
+                    '<ion-toggle ng-model="forceMjpeg.value"   toggle-class="toggle-calm">'+
+                    $translate.instant('kForceMjpeg')+'</ion-toggle>'+
+                    '<div class="item item-divider" style="background:#666666;color:white;">'+
+                    '</div><ion-radio-fix ng-repeat="item in monFunctions" ng-value="item.value" ng-model="monfunc.myfunc"> {{item.text}} </ion-radio-fix>',
 
           title: $translate.instant('kChangeSettingsFor') + ' ' + monitorName,
 
-- 
cgit v1.2.3