diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2020-04-30 08:59:52 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2020-04-30 08:59:52 -0400 |
| commit | 3abdc4ea0aaa7895c5ad08560648dd000263bbfc (patch) | |
| tree | 0615eedf057a3b60549d969ffe5a8d39c7eb7bfb /www/js/EventModalCtrl.js | |
| parent | b3854d30ded71fb3793602106fb50f25ff2a7bb9 (diff) | |
#933 remove spaces, removed encodeURIComponent, add back encodeURI in cordova http
Diffstat (limited to 'www/js/EventModalCtrl.js')
| -rw-r--r-- | www/js/EventModalCtrl.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index 2cc08bf7..c93bd8f4 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -1478,20 +1478,20 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro // now get event details to show alarm frames var loginData = NVR.getLogin(); var nextEvent = loginData.apiurl + "/events/index" + - "/StartTime >: " + currentEvent.Event.StartTime + - ($scope.followSameMonitor == '1' ? "/"+encodeURIComponent("MonitorId =: ") + currentEvent.Monitor.Id : "") ; + "/StartTime >:" + currentEvent.Event.StartTime + + ($scope.followSameMonitor == '1' ? "/"+"MonitorId=:" + currentEvent.Monitor.Id : "") ; if ($scope.useFilters) { - nextEvent = nextEvent + "/"+encodeURIComponent("AlarmFrames >=: ") + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); + nextEvent = nextEvent + "/"+"AlarmFrames>=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); } nextEvent = nextEvent + ".json?sort=StartTime&direction=asc&limit=1"+$rootScope.authSession; var prevEvent = loginData.apiurl + "/events/index" + - "/"+encodeURIComponent("StartTime <: ") + currentEvent.Event.StartTime + - ($scope.followSameMonitor == '1' ? "/"+encodeURIComponent("MonitorId =: " )+ currentEvent.Monitor.Id : ""); + "/"+"StartTime<:" + currentEvent.Event.StartTime + + ($scope.followSameMonitor == '1' ? "/"+"MonitorId=:"+ currentEvent.Monitor.Id : ""); if ($scope.useFilters) { - prevEvent = prevEvent + "/"+encodeURIComponent("AlarmFrames >=: ") + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); + prevEvent = prevEvent + "/"+"AlarmFrames>=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); } prevEvent = prevEvent + ".json?sort=StartTime&direction=desc&limit=1"+$rootScope.authSession; |