Merge remote branch 'upstream/master'

1 files changed, 4 insertions, 3 deletions

diff --git a/src/services.js b/src/services.js
index fa9cdaa4..a5158149 100644
--- a/src/services.js
+++ b/src/services.js
@@ -1,11 +1,12 @@
+var URL_MATCH = /^(file|ftp|http|https):\/\/(\w+:{0,1}\w*@)?([\w\.-]*)(:([0-9]+))?([^\?#]+)(\?([^#]*))?(#(.*))?$/,
+    HASH_MATCH = /^([^\?]*)?(\?([^\?]*))?$/,
+    DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp':21};
+
 angularService("$window", bind(window, identity, window));
 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 HASH_MATCH = /^([^\?]*)?(\?([^\?]*))?$/;
-var DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp':21};
 angularService("$location", function(browser){
   var scope = this,
       location = {parse:parseUrl, toString:toString, update:update},