Merge pull request #2051 from IgniteUI/use-encodeUriComponent-192

Use encodeUriComponent instaead of escape to encode filtering params in URL
IgniteUI · Feb 24, 2020 · a9a945a · a9a945a
2 parents e5a1d01 + 1e40b3d
commit a9a945a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/js/modules/infragistics.datasource.js b/src/js/modules/infragistics.datasource.js
@@ -26,7 +26,7 @@
  *
  */
 
-/*global Class, ActiveXObject, DOMParser, XPathResult, XMLSerializer, escape */
+/*global Class, ActiveXObject, DOMParser, XPathResult, XMLSerializer  */
 (function (factory) {
 	if (typeof define === "function" && define.amd) {
 
@@ -5025,7 +5025,7 @@
 							);
 							/* d = ffields[i].expr.getTime(); */
 						} else {
-							d = escape(ffields[ i ].expr);
+							d = encodeURIComponent(ffields[ i ].expr);
 						}
 						if (params.filteringParams[ key ] === undefined) {
 							params.filteringParams[ key ] = ffields[ i ].cond +

diff --git a/tests/unit/dataSource/properties/properties-test.js b/tests/unit/dataSource/properties/properties-test.js
@@ -1035,7 +1035,7 @@ QUnit.module("igDataSource Properties", {
 			var nYear = nextMonthDate.getFullYear();
 			var prevMonthYear = prevMonthDate.getFullYear();
 
-			var params = unescape($.param(dsFilter._encodeUrl()));
+			var params = decodeURIComponent($.param(dsFilter._encodeUrl()));
 			assert.equal(params,
 				"$filter=day(Date) eq " + date.getDate().toString() + " and month(Date) eq " + currMonth.toString() + " and year(Date) eq " + date.getFullYear().toString() +
 				" and month(Date2) eq " + prevMonth.toString() + " and year(Date2) eq " + prevMonthYear.toString() + " and month(Date3) eq " +

diff --git a/tests/unit/dataSource/remote/remote-test.js b/tests/unit/dataSource/remote/remote-test.js