From 3abdc4ea0aaa7895c5ad08560648dd000263bbfc Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Thu, 30 Apr 2020 08:59:52 -0400 Subject: #933 remove spaces, removed encodeURIComponent, add back encodeURI in cordova http --- www/js/MomentCtrl.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'www/js/MomentCtrl.js') diff --git a/www/js/MomentCtrl.js b/www/js/MomentCtrl.js index dcf8a721..07f8b09d 100644 --- a/www/js/MomentCtrl.js +++ b/www/js/MomentCtrl.js @@ -73,7 +73,7 @@ var masonry = null; excludeMonitorsFilter = ""; for (var i = 0; i < excludeMonitors.length; i++) { - excludeMonitorsFilter = excludeMonitorsFilter + "/"+encodeURIComponent("MonitorId !=:") + excludeMonitors[i]; + excludeMonitorsFilter = excludeMonitorsFilter + "/"+"MonitorId!=:" + excludeMonitors[i]; } NVR.debug("Constructed Monitor Filter =" + excludeMonitorsFilter); } @@ -785,7 +785,7 @@ var masonry = null; var ld = NVR.getLogin(); // in API, always sort by StartTime so all monitors are represented - var myurl = ld.apiurl + "/events/index/"+encodeURIComponent("AlarmFrames >=:1") + excludeMonitorsFilter + "/"+encodeURIComponent("StartTime <=:") + timeTo + "/"+encodeURIComponent("EndTime >=:") + timeFrom + ".json?sort=" + "StartTime" + "&direction=desc"+$rootScope.authSession; + var myurl = ld.apiurl + "/events/index/"+"AlarmFrames>=:1" + excludeMonitorsFilter + "/"+"StartTime<=:" + timeTo + "/"+"EndTime>=:" + timeFrom + ".json?sort=" + "StartTime" + "&direction=desc"+$rootScope.authSession; NVR.debug("Retrieving " + myurl); -- cgit v1.2.3