Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-03-17 07:40:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix($location): support urls with any protocol

Browse source 
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.
This commit is contained in:
Igor Minar 2012-05-11 23:56:37 -07:00
parent 679cb8a74a
commit c1533ef576
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ng/location.js
View file

@ -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};

11
test/ng/locationSpec.js
View file

@ -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');
});
});