bunch of cleanup

This commit is contained in:
Colin Frei 2013-02-03 13:58:28 +01:00
parent b67b763d89
commit d64c6b3f16
8 changed files with 82 additions and 16 deletions

View file

@ -4870,7 +4870,8 @@ function $InterpolateProvider() {
}];
}
var URL_MATCH = /^([^:]+):\/\/(\w+:{0,1}\w*@)?([\w\.-]*)(:([0-9]+))?(\/[^\?#]*)?(\?([^#]*))?(#(.*))?$/,
// Colin: adjusted URL_MATCH to support curly braces in packaged apps app://{asdf-fda-asdf} url format
var URL_MATCH = /^([^:]+):\/\/(\w+:{0,1}\w*@)?([\w\.{}-]*)(:([0-9]+))?(\/[^\?#]*)?(\?([^#]*))?(#(.*))?$/,
PATH_MATCH = /^([^\?#]*)?(\?([^#]*))?(#(.*))?$/,
HASH_MATCH = PATH_MATCH,
DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp': 21};