diff options
| -rw-r--r-- | config.xml | 3 | ||||
| -rw-r--r-- | package.json | 8 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 12 | ||||
| -rw-r--r-- | www/templates/reorder-modal.html | 6 |
4 files changed, 25 insertions, 4 deletions
@@ -186,6 +186,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-statusbar" spec="~2.4.4-dev" /> + <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="5.1.1" /> diff --git a/package.json b/package.json index 1696e5ec..97cfc2b9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version": "1.4.004", + "version":"1.4.004", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", @@ -61,6 +61,9 @@ "cordova-plugin-inappbrowser": {}, "cordova-plugin-app-version": {}, "cordova-plugin-statusbar-pp-fork": {}, + "cordova-plugin-ionic-webview": { + "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" + }, "cordova-plugin-media-pp-fork": {} } }, @@ -86,6 +89,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", @@ -224,4 +228,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 518a2687..6facc5be 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -919,6 +919,10 @@ angular.module('zmApp.controllers') if ($scope.MontageMonitors[i].Monitor.listDisplay == 'show') NVR.killLiveStream($scope.MontageMonitors[i].Monitor.connKey, $scope.MontageMonitors[i].Monitor.controlURL); } // in context of timeout + $scope.reorder = { + selected:false + }; + $ionicModal.fromTemplateUrl('templates/reorder-modal.html', { scope: $scope, animation: 'slide-in-up', @@ -949,6 +953,14 @@ angular.module('zmApp.controllers') }; + $scope.selectUnselectAllToggleReorder = function () { + $scope.reorder.selected = !$scope.reorder.selected; + + for (var i=0; i < $scope.copyMontage.length; i++) { + $scope.copyMontage[i].Monitor.listDisplay = $scope.reorder.selected ? 'show':'noshow'; + } + + }; $scope.$on('modal.removed', function (e, m) { diff --git a/www/templates/reorder-modal.html b/www/templates/reorder-modal.html index aecf81bc..2b5f6698 100644 --- a/www/templates/reorder-modal.html +++ b/www/templates/reorder-modal.html @@ -1,9 +1,11 @@ <ion-modal-view cache-view="false" style="width: 90%; height: 90%; top: 5%; left: 5%; right: 5%; bottom: 5%;"> <ion-header-bar class="bar-stable"> <h1 class="title"></h1> + <div class="buttons"> - <button class="button button-icon icon ion-checkmark" ng-click="saveReorder()"></button> - <button class="button button-icon icon ion-close" ng-click="cancelReorder()"></button> + <button ng-class="(reorder.selected)?'button button-icon icon ion-ios-checkmark':'button button-icon icon ion-ios-checkmark-outline'" ng-click="selectUnselectAllToggleReorder()"></button> + <button class="button button-small button-dark" ng-click="saveReorder()">{{'kButtonOk'|translate}}</button> + <button class="button button-small" ng-click="cancelReorder()">{{'kButtonCancel'|translate}}</button> </div> </ion-header-bar> <ion-content> |