fix($location): fix URL interception in hash-bang mode

Closes #1051
angular · Apr 15, 2013 · 58ef323 · 58ef323
1 parent 59bfe8e
commit 58ef323
Show file tree

Hide file tree

Showing 4 changed files with 186 additions and 206 deletions.
diff --git a/src/ng/http.js b/src/ng/http.js
@@ -52,7 +52,7 @@ function isSameDomain(requestUrl, locationUrl) {
       relativeProtocol: match[2] === undefined || match[2] === ''
     };
 
-  match = URL_MATCH.exec(locationUrl);
+  match = SERVER_MATCH.exec(locationUrl);
   var domain2 = {
       protocol: match[1],
       host: match[3],

diff --git a/src/ng/httpBackend.js b/src/ng/httpBackend.js
@@ -117,7 +117,7 @@ function createHttpBackend($browser, XHR, $browserDefer, callbacks, rawDocument,
 
     function completeRequest(callback, status, response, headersString) {
       // URL_MATCH is defined in src/service/location.js
-      var protocol = (url.match(URL_MATCH) || ['', locationProtocol])[1];
+      var protocol = (url.match(SERVER_MATCH) || ['', locationProtocol])[1];
 
       // fix status code for file protocol (it's always 0)
       status = (protocol == 'file') ? (response ? 200 : 404) : status;