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/TimelineCtrl.js | |
| parent | b3854d30ded71fb3793602106fb50f25ff2a7bb9 (diff) | |
#933 remove spaces, removed encodeURIComponent, add back encodeURI in cordova http
Diffstat (limited to 'www/js/TimelineCtrl.js')
| -rw-r--r-- | www/js/TimelineCtrl.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index aaab1f24..9de37c18 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -783,12 +783,12 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla // FIXME: totally ignoring event pages - hoping it wont be more than 100 or 150 whatever // the events per page limit is. Why? laziness. // - var completedEvents = ld.apiurl + '/events/index/'+encodeURIComponent('EndTime >=:') + from; + var completedEvents = ld.apiurl + '/events/index/'+'EndTime>=:' + from; // we can add alarmCount as this is really for completed events - completedEvents = completedEvents + "/"+encodeURIComponent("AlarmFrames >=:") + (ld.enableAlarmCount ? ld.minAlarmCount : 0); + completedEvents = completedEvents + "/"+"AlarmFrames>=:" + (ld.enableAlarmCount ? ld.minAlarmCount : 0); if (ld.objectDetectionFilter) { - completedEvents = completedEvents + '/'+ encodeURIComponent('Notes REGEXP:"detected:"'); + completedEvents = completedEvents + '/'+ 'Notes REGEXP:"detected:"'; } completedEvents = completedEvents + ".json?"+$rootScope.authSession; @@ -800,7 +800,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla var st = moment(lastTimeForEvent).tz(NVR.getTimeZoneNow()); st = st.subtract(10, 'minutes').locale('en').format("YYYY-MM-DD HH:mm:ss"); - var ongoingEvents = ld.apiurl + '/'+encodeURIComponent('events/index/StartTime >=:') + st + encodeURIComponent('/EndTime =:.json')+'?'+$rootScope.authSession; + var ongoingEvents = ld.apiurl + '/'+'events/index/StartTime>=:' + st + '/EndTime=:.json'+'?'+$rootScope.authSession; //NVR.debug("Getting incremental events using: " + completedEvents); NVR.debug("Completed events API:" + completedEvents); |