fix(angular.encodeUriSegment): do not encode semi-colon

RFC 3986 indicates that ; is not encoded as part of the URI, as is the case with other members of sub-delim. Changed encodeUriSegment to match that behaviour, along with the corresponding spec.
angular · Nov 19, 2013 · 0ea270e · 0ea270e
1 parent 751f058
commit 0ea270e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Angular.js b/src/Angular.js
@@ -1065,6 +1065,7 @@ function toKeyValue(obj) {
  */
 function encodeUriSegment(val) {
   return encodeUriQuery(val, true).
+             replace(/%3B/gi, ';').
              replace(/%26/gi, '&').
              replace(/%3D/gi, '=').
              replace(/%2B/gi, '+');

diff --git a/test/AngularSpec.js b/test/AngularSpec.js
@@ -569,12 +569,12 @@ describe('angular', function() {
         toEqual("-_.!~*'()%20-_.!~*'()");
 
       //don't encode the rest of pchar'
-      expect(encodeUriSegment(':@&=+$, :@&=+$,')).
-        toEqual(':@&=+$,%20:@&=+$,');
+      expect(encodeUriSegment(':;@&=+$, :;@&=+$,')).
+        toEqual(':;@&=+$,%20:;@&=+$,');
 
-      //encode '/', ';' and ' ''
-      expect(encodeUriSegment('/; /;')).
-        toEqual('%2F%3B%20%2F%3B');
+      //encode '/', and ' ''
+      expect(encodeUriSegment('/ /')).
+        toEqual('%2F%20%2F');
     });
   });