Permalink
Browse files

fix($location): support urls with any protocol

The url used for location parsing was quite strict and did not support
custom url schemes like "chrome-extension://". With this change the only
requirement for scheme is that it doesn't contain ":" character.
  • Loading branch information...
1 parent 679cb8a commit c1533ef5762199bea18d3bf3bcba7fcf89272931 @IgorMinar IgorMinar committed May 12, 2012
Showing with 12 additions and 1 deletion.
  1. +1 −1 src/ng/location.js
  2. +11 −0 test/ng/locationSpec.js
View
@@ -1,6 +1,6 @@
'use strict';
-var URL_MATCH = /^(file|ftp|http|https):\/\/(\w+:{0,1}\w*@)?([\w\.-]*)(:([0-9]+))?(\/[^\?#]*)?(\?([^#]*))?(#(.*))?$/,
+var URL_MATCH = /^([^:]+):\/\/(\w+:{0,1}\w*@)?([\w\.-]*)(:([0-9]+))?(\/[^\?#]*)?(\?([^#]*))?(#(.*))?$/,
PATH_MATCH = /^([^\?#]*)?(\?([^#]*))?(#(.*))?$/,
HASH_MATCH = PATH_MATCH,
DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp': 21};
@@ -632,6 +632,17 @@ describe('$location', function() {
expect(match[10]).toBe('?book=moby');
});
+
+
+ it('should parse chrome extension urls', function() {
+ var match = URL_MATCH.exec('chrome-extension://jjcldkdmokihdaomalanmlohibnoplog/index.html?foo#bar');
+
+ expect(match[1]).toBe('chrome-extension');
+ expect(match[3]).toBe('jjcldkdmokihdaomalanmlohibnoplog');
+ expect(match[6]).toBe('/index.html');
+ expect(match[8]).toBe('foo');
+ expect(match[10]).toBe('bar');
+ });
});

0 comments on commit c1533ef

Please sign in to comment.