diff options
| author | Manuel Braun | 2013-03-07 13:36:38 +0100 |
|---|---|---|
| committer | Misko Hevery | 2013-03-15 21:19:31 -0700 |
| commit | 3a81dd8bddbade81c4c9f734813458d0d969a4bf (patch) | |
| tree | 36467ec2e4b3c3fa590f825842ea8d13ad9d7873 /src/ng/location.js | |
| parent | df9bff13b2bf8376428cd28fce472aeee07c4bbe (diff) | |
| download | angular.js-3a81dd8bddbade81c4c9f734813458d0d969a4bf.tar.bz2 | |
fix($location): parse FirefoxOS packaged app urls
FirefoxOS uses special URLs like
app://{d0419af1-8b42-41c5-96f4-ef4179e52315}/index.html for packaged Apps.
Closes #2112
Diffstat (limited to 'src/ng/location.js')
| -rw-r--r-- | src/ng/location.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ng/location.js b/src/ng/location.js index e6f629e5..3196b1d5 100644 --- a/src/ng/location.js +++ b/src/ng/location.js @@ -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}; |