fix($http): don't encode URL query substring "null" to "+"

Andrew-McLeod · IgorMinar · commit b13da18e11d5 · 2013-02-26T17:29:08.000-08:00
Fixes issue in encodeUriQuery used by $http and $resource that
treats null as a string and replaces the characters "null" with "+".
diff --git a/src/Angular.js b/src/Angular.js
@@ -855,7 +855,7 @@ function encodeUriQuery(val, pctEncodeSpaces) {
              replace(/%3A/gi, ':').
              replace(/%24/g, '$').
              replace(/%2C/gi, ',').
-             replace((pctEncodeSpaces ? null : /%20/g), '+');
+             replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
 }
 
 
diff --git a/src/ngResource/resource.js b/src/ngResource/resource.js
@@ -262,7 +262,7 @@ angular.module('ngResource', ['ng']).
         replace(/%3A/gi, ':').
         replace(/%24/g, '$').
         replace(/%2C/gi, ',').
-        replace((pctEncodeSpaces ? null : /%20/g), '+');
+        replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
     }
 
     function Route(template, defaults) {
diff --git a/test/AngularSpec.js b/test/AngularSpec.js
@@ -415,6 +415,14 @@ describe('angular', function() {
       //encode ' ' as '%20' when a flag is used
       expect(encodeUriQuery('  ', true)).
         toEqual('%20%20');
+
+      //do not encode `null` as '+' when flag is used
+      expect(encodeUriQuery('null', true)).
+        toEqual('null');
+
+      //do not encode `null` with no flag
+      expect(encodeUriQuery('null')).
+        toEqual('null');
     });
   });
 
@@ -673,7 +681,7 @@ describe('angular', function() {
           toBe('<ng-abc x="2A">');
     });
   });
-  
+
   describe('startingTag', function() {
     it('should allow passing in Nodes instead of Elements', function() {
       var txtNode = document.createTextNode('some text');
diff --git a/test/ngResource/resourceSpec.js b/test/ngResource/resourceSpec.js
@@ -122,6 +122,12 @@ describe("resource", function() {
     R.get({a: 'doh@fo o', ':bar': '$baz@1', '!do&h': 'g=a h'});
   });
 
+  it('should not encode string "null" to "+" in url params', function() {
+   var R = $resource('/Path/:a');
+   $httpBackend.expect('GET', '/Path/null').respond('{}');
+   R.get({a: 'null'});
+  });
+
   it('should allow relative paths in resource url', function () {
     var R = $resource(':relativePath');
     $httpBackend.expect('GET', 'data.json').respond('{}');

Original file line number	Diff line number	Diff line change
`@@ -855,7 +855,7 @@ function encodeUriQuery(val, pctEncodeSpaces) {`
`855`	`855`	`replace(/%3A/gi, ':').`
`856`	`856`	`replace(/%24/g, '$').`
`857`	`857`	`replace(/%2C/gi, ',').`
`858`		`- replace((pctEncodeSpaces ? null : /%20/g), '+');`
	`858`	`+ replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));`
`859`	`859`	`}`
`860`	`860`
`861`	`861`
Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ angular.module('ngResource', ['ng']).`
`262`	`262`	`replace(/%3A/gi, ':').`
`263`	`263`	`replace(/%24/g, '$').`
`264`	`264`	`replace(/%2C/gi, ',').`
`265`		`- replace((pctEncodeSpaces ? null : /%20/g), '+');`
	`265`	`+ replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));`
`266`	`266`	`}`
`267`	`267`
`268`	`268`	`function Route(template, defaults) {`