Skip to content

Commit

Permalink
fix($location): parse FirefoxOS packaged app urls
Browse files Browse the repository at this point in the history
FirefoxOS uses special URLs like
app://{d0419af1-8b42-41c5-96f4-ef4179e52315}/index.html for packaged Apps.

Closes angular#2112
  • Loading branch information
Schibum authored and mhevery committed Mar 16, 2013
1 parent 866d3fb commit a476972
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/ng/location.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

var URL_MATCH = /^([^:]+):\/\/(\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};
Expand Down
13 changes: 13 additions & 0 deletions test/ng/locationSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,19 @@ describe('$location', function() {
expect(match[8]).toBe('foo');
expect(match[10]).toBe('bar');
});

it('should parse FFOS app:// urls', function() {
var match = URL_MATCH.exec('app://{d0419af1-8b42-41c5-96f4-ef4179e52315}/path');

expect(match[1]).toBe('app');
expect(match[3]).toBe('{d0419af1-8b42-41c5-96f4-ef4179e52315}');
expect(match[5]).toBeFalsy();
expect(match[6]).toBe('/path');
expect(match[8]).toBeFalsy();

match = URL_MATCH.exec('app://}foo{')
expect(match).toBe(null);
});
});


Expand Down

0 comments on commit a476972

Please sign in to comment.