diff options
| -rw-r--r-- | config.xml | 2 | ||||
| -rw-r--r-- | package.json | 4 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 13 |
3 files changed, 10 insertions, 9 deletions
@@ -172,10 +172,10 @@ <plugin name="cordova-plugin-photo-library" spec="https://github.com/nilebma/cordova-plugin-photo-library.git"> <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value=" " /> </plugin> + <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-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="7.1.4" /> <engine name="ios" spec="5.0.0" /> </widget> diff --git a/package.json b/package.json index b2bf5460..f26478f2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version": "1.3.057", + "version":"1.3.057", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", @@ -183,4 +183,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 4a5e03e6..3769df71 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -595,7 +595,7 @@ angular.module('zmApp.controllers') }; - function getEventStatus(monitor, expandSidebar) { + function getEventStatus(monitor, showMontageSidebars) { ld = NVR.getLogin(); // https:///zm/api/events/index/MonitorId=:2.json?sort=StartTime&direction=desc&limit=1 @@ -634,7 +634,7 @@ angular.module('zmApp.controllers') var mid = monitor.Monitor.Id; if (res.events.length == 0) res = undefined; monitor.Monitor.lastEvent = res; - if (monitor.Monitor.lastEvent && expandSidebar) { + if (monitor.Monitor.lastEvent && showMontageSidebars) { monitor.Monitor.showSidebar = true; } @@ -646,7 +646,7 @@ angular.module('zmApp.controllers') } - function loadEventStatus(expandSidebars) { + function loadEventStatus(showMontageSidebars) { // console.log ("LOADING EVENT STATUS"); if (!NVR.getLogin().enableMontageOverlays) { @@ -658,7 +658,7 @@ angular.module('zmApp.controllers') if ($scope.MontageMonitors[i].Monitor.Enabled == 0 || $scope.MontageMonitors[i].Monitor.listDisplay == 'noshow' || $scope.MontageMonitors[i].Monitor.Function == 'None') continue; - getEventStatus($scope.MontageMonitors[i], expandSidebars); + getEventStatus($scope.MontageMonitors[i], showMontageSidebars); } @@ -1393,7 +1393,7 @@ angular.module('zmApp.controllers') // console.log ("Refreshing Image..."); }.bind(this), zm.alarmStatusTime); - loadEventStatus(true); + loadEventStatus(ld.showMontageSidebars); intervalHandleEventStatus = $interval(function () { loadEventStatus(); // console.log ("Refreshing Image..."); @@ -2213,7 +2213,7 @@ angular.module('zmApp.controllers') // console.log ("Refreshing Image..."); }.bind(this), zm.alarmStatusTime); - loadEventStatus(true); + loadEventStatus(ld.showMontageSidebars); intervalHandleEventStatus = $interval(function () { loadEventStatus(); // console.log ("Refreshing Image..."); @@ -2279,6 +2279,7 @@ angular.module('zmApp.controllers') for (var i = 0; i < $scope.MontageMonitors.length; i++) { $scope.eventButtonClicked ($scope.MontageMonitors[i], false); + $scope.MontageMonitors[i].Monitor.showSidebar = false; } }; |