diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2020-05-01 11:02:34 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2020-05-01 11:02:34 -0400 |
| commit | d8953a069365e51000aa0e86e38bdd6bd251f2f4 (patch) | |
| tree | bc94c4e174e08d9462cdb99f5cd922e3fe948f8f /www/js/MontageCtrl.js | |
| parent | f13ae545e81fee9663a9a06177602efab5cfbdf0 (diff) | |
#933 add back spaces, 1.32 breaks. Make encoding optional in dev settings
Diffstat (limited to 'www/js/MontageCtrl.js')
| -rw-r--r-- | www/js/MontageCtrl.js | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 6facc5be..90cfac1c 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -583,16 +583,16 @@ angular.module('zmApp.controllers') // https:///zm/api/events/index/MonitorId=:2.json?sort=StartTime&direction=desc&limit=1 var apiurl = ld.apiurl +'/events/index'; // we need some interval or it errors - apiurl += "/"+"MonitorId=:" + monitor.Monitor.Id; + apiurl += "/"+"MonitorId =:" + monitor.Monitor.Id; if (monitor.Monitor.Id in ld.lastEventCheckTimes) { // now is server TZ time var now = ld.lastEventCheckTimes[monitor.Monitor.Id]; - apiurl += "/StartTime>:" + now; + apiurl += "/StartTime >:" + now; } - apiurl += "/"+"AlarmFrames>=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0); + apiurl += "/"+"AlarmFrames >=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0); if (ld.objectDetectionFilter) { apiurl +='/'+'Notes REGEXP:detected:'; } @@ -919,6 +919,7 @@ 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 }; @@ -932,12 +933,18 @@ angular.module('zmApp.controllers') $scope.modal = modal; $scope.reOrderActive = true; $scope.modal.show(); + $scope.reorder = { + selected:false + }; }); }); } else { + $scope.reorder = { + selected:false + }; $ionicModal.fromTemplateUrl('templates/reorder-modal.html', { scope: $scope, animation: 'slide-in-up', |