diff options
| author | Misko Hevery | 2010-05-13 12:03:10 -0700 |
|---|---|---|
| committer | Misko Hevery | 2010-05-13 12:03:10 -0700 |
| commit | 4b9b9e98300b9554faf0c960674eb75750227404 (patch) | |
| tree | 9ed8ef7e8b499178dcce5e0133546c7dbea3dd3f /src/services.js | |
| parent | 271b535c8285cb90781bf1e8ee56d6e68210a6a9 (diff) | |
| download | angular.js-4b9b9e98300b9554faf0c960674eb75750227404.tar.bz2 | |
fix incorect parsing of url if it contains dash - character
Diffstat (limited to 'src/services.js')
| -rw-r--r-- | src/services.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/services.js b/src/services.js index bdfbfdb4..55e3b2f6 100644 --- a/src/services.js +++ b/src/services.js @@ -3,7 +3,7 @@ angularService("$document", function(window){ return jqLite(window.document); }, {inject:['$window']}); -var URL_MATCH = /^(file|ftp|http|https):\/\/(\w+:{0,1}\w*@)?([\w\.]*)(:([0-9]+))?([^\?#]+)(\?([^#]*))?(#(.*))?$/; +var URL_MATCH = /^(file|ftp|http|https):\/\/(\w+:{0,1}\w*@)?([\w\.-]*)(:([0-9]+))?([^\?#]+)(\?([^#]*))?(#(.*))?$/; var HASH_MATCH = /^([^\?]*)?(\?([^\?]*))?$/; var DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp':21}; angularService("$location", function(browser){ |