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/NVR.js | |
| parent | b3854d30ded71fb3793602106fb50f25ff2a7bb9 (diff) | |
#933 remove spaces, removed encodeURIComponent, add back encodeURI in cordova http
Diffstat (limited to 'www/js/NVR.js')
| -rw-r--r-- | www/js/NVR.js | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/www/js/NVR.js b/www/js/NVR.js index bdeadece..482fcd7e 100644 --- a/www/js/NVR.js +++ b/www/js/NVR.js @@ -240,6 +240,8 @@ angular.module('zmApp.controllers') * @returns */ function setCordovaHttpOptions() { + /*debug ("Cordova HTTP: Setting JSON serializer"); + cordova.plugin.http.setDataSerializer('utf8');*/ if (loginData.isUseBasicAuth) { debug("Cordova HTTP: configuring basic auth"); cordova.plugin.http.useBasicAuth(loginData.basicAuthUser, loginData.basicAuthPassword); @@ -2823,7 +2825,7 @@ angular.module('zmApp.controllers') log((forceReload == 1) ? "getMonitors:Force reloading all monitors" : "getMonitors:Loading all monitors"); var apiurl = loginData.apiurl; var myurl = apiurl + "/monitors"; - myurl += "/index/"+encodeURIComponent("Type !=:WebSite.json") + "?"+$rootScope.authSession; + myurl += "/index/"+"Type!=:WebSite.json" + "?"+$rootScope.authSession; getZmsMultiPortSupport() .then(function (zmsPort) { @@ -3479,17 +3481,17 @@ angular.module('zmApp.controllers') var myurl = apiurl + "/events/index"; if (monitorId != 0) - myurl = myurl + "/"+encodeURIComponent("MonitorId:") + monitorId; + myurl = myurl + "/"+"MonitorId:" + monitorId; if (startTime) - myurl = myurl + "/"+encodeURIComponent("StartTime <=:") + endTime; + myurl = myurl + "/"+"StartTime<=:" + endTime; if (endTime) - myurl = myurl + "/"+encodeURIComponent("EndTime >=:") + startTime; + myurl = myurl + "/"+"EndTime>=:" + startTime; - myurl = myurl + "/"+encodeURIComponent("AlarmFrames >=:") + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); + myurl = myurl + "/"+"AlarmFrames>=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); //https:///zm/api/events/index/Notes%20REGEXP:detected%3A.json if (loginData.objectDetectionFilter && !noObjectFilter) { - myurl = myurl +'/'+ encodeURIComponent('Notes REGEXP:detected:'); + myurl = myurl +'/'+ 'Notes REGEXP:detected:'; } @@ -3570,13 +3572,13 @@ angular.module('zmApp.controllers') var myurl = apiurl + "/events/index"; if (monitorId != 0) - myurl = myurl + "/"+encodeURIComponent("MonitorId:") + monitorId; + myurl = myurl + "/"+"MonitorId:" + monitorId; if (startTime) - myurl = myurl + "/"+encodeURIComponent("StartTime <=:") + endTime; + myurl = myurl + "/"+"StartTime<=:" + endTime; if (endTime) - myurl = myurl + "/"+encodeURIComponent("EndTime >=:") + startTime; + myurl = myurl + "/"+"EndTime>=:" + startTime; - myurl = myurl + "/"+encodeURIComponent("AlarmFrames >=:") + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); + myurl = myurl + "/"+"AlarmFrames>=:" + (loginData.enableAlarmCount ? loginData.minAlarmCount : 0); //console.log ('********* MON FILTER '+monListFilter); if (monListFilter) @@ -3585,7 +3587,7 @@ angular.module('zmApp.controllers') // don't know why but adding page messes up Notes //https:///zm/api/events/index/Notes%20REGEXP: detected%3A.json if (loginData.objectDetectionFilter && !noObjectFilter) { - myurl = myurl + '/'+encodeURIComponent('Notes REGEXP:detected:'); + myurl = myurl + '/'+'Notes REGEXP:detected:'; } |