fix($location): respect absolute paths correctly

Fixes absolute links on browsers with html5Mode enabled.

Previously clicking on a link out of the base href would still rewrite
the URL.

Author: chrisirhc

src/ng/location.js

@@ -675,26 +675,32 @@ function $LocationProvider(){
 
         if (href && href.indexOf('://') < 0) {         // Ignore absolute URLs
           var prefix = '#' + hashPrefix;
-          if (href[0] == '/') {
-            // absolute path - replace old path
-            absHref = appBase + prefix + href;
-          } else if (href[0] == '#') {
-            // local anchor
-            absHref = appBase + prefix + ($location.path() || '/') + href;
-          } else {
-            // relative path - join with current path
-            var stack = $location.path().split("/"),
-              parts = href.split("/");
-            if (stack.length === 2 && !stack[1]) stack.length = 1;
-            for (var i=0; i<parts.length; i++) {
-              if (parts[i] == ".")
-                continue;
-              else if (parts[i] == "..")
-                stack.pop();
-              else if (parts[i].length)
-                stack.push(parts[i]);
+          var baseHrefNoFile = stripFile(baseHref);
+          if (href[0] == '/' && beginsWith(baseHrefNoFile, href)) {
+            // absolute path - within base
+            absHref = appBase + prefix + href.substr(baseHrefNoFile.length - 1);
+          } else if (href[0] != '/') { // Ignore absolute path outside of base
+            if (beginsWith(prefix + '/', href)) {
+              // local anchor with absolute path
+              absHref = appBase + href;
+            } else if (href[0] == '#') {
+              // local anchor
+              absHref = appBase + prefix + ($location.path() || '/') + href;
+            } else {
+              // relative path - join with current path
+              var stack = $location.path().split("/"),
+                parts = href.split("/");
+              if (stack.length === 2 && !stack[1]) stack.length = 1;
+              for (var i=0; i<parts.length; i++) {
+                if (parts[i] == ".")
+                  continue;
+                else if (parts[i] == "..")
+                  stack.pop();
+                else if (parts[i].length)
+                  stack.push(parts[i]);
+              }
+              absHref = appBase + prefix + stack.join('/');
             }
-            absHref = appBase + prefix + stack.join('/');
           }
         }
       }

test/ng/locationSpec.js

@@ -1206,8 +1206,8 @@ describe('$location', function() {
     });
 
 
-    it('should replace current path when link begins with "/" and history disabled', function() {
-      configureService('/link', true, false, true);
+    it('should replace current path when hashbang url begins with "/" and history enabled on old browser', function() {
+      configureService('#!/link', true, false, true);
       inject(
         initBrowser(),
         initLocation(),
@@ -1220,6 +1220,34 @@ describe('$location', function() {
     });
 
 
+    it('should replace current path when relative link begins with "/base/" and history enabled on old browser', function() {
+      configureService('/base/link', true, false, true);
+      inject(
+        initBrowser(),
+        initLocation(),
+        function($browser, $location) {
+          $location.path('/some');
+          browserTrigger(link, 'click');
+          expectRewriteTo($browser, 'http://host.com/base/index.html#!/link');
+        }
+      );
+    });
+
+
+    it('should not rewrite when relative link begins with "/" and history enabled on old browser', function() {
+      configureService('/other_base/link', true, false, true);
+      inject(
+        initBrowser(),
+        initLocation(),
+        function($browser, $location) {
+          $location.path('/some');
+          browserTrigger(link, 'click');
+          expectNoRewrite($browser);
+        }
+      );
+    });
+
+
     it('should replace current hash fragment when link begins with "#" history disabled', function() {
       configureService('#link', true, false, true);
       inject(