fix($location): use url resolve shim

Author: chrisirhc

src/ng/location.js

@@ -259,6 +259,8 @@ function LocationHashbangInHtml5Url(appBase, hashPrefix) {
 
     if ( appBase == stripHash(url) ) {
       return url;
+    } else if ( (appUrl = beginsWith(appBaseNoFile + hashPrefix + '/', url)) ) {
+      return appBase + hashPrefix + appUrl;
     } else if ( (appUrl = beginsWith(appBaseNoFile, url)) ) {
       return appBase + hashPrefix + appUrl;
     } else if ( appBaseNoFile === url + '/') {
@@ -675,39 +677,22 @@ function $LocationProvider(){
 
         if (href && href.indexOf('://') < 0) {         // Ignore absolute URLs
           var prefix = '#' + hashPrefix;
-          var baseHrefNoFile = stripFile(baseHref);
-          var appOnRoot = stripFile(appBase) == (serverBase(appBase) + '/');
-          if (href[0] == '/' && (appOnRoot || (baseHref && beginsWith(baseHrefNoFile, href)))) {
-            // absolute path - within base or when the app is on the root
-            var hrefNoBase = baseHrefNoFile ? href.substr(baseHrefNoFile.length - 1) : href;
-            absHref = appBase + prefix + hrefNoBase;
-          } else if (href[0] != '/') { // Ignore absolute path outside of base
-            var beginsWithPrefix = beginsWith(prefix, href);
-            if (beginsWith(prefix + '/', href)) {
-              // local anchor with absolute path
-              absHref = appBase + href;
-            } else if (!beginsWithPrefix && href[0] == '#') {
-              // local anchor
-              absHref = appBase + prefix + ($location.path() || '/') + href;
-            } else if (!beginsWithPrefix && baseHref) {
-              // local anchor and base[href] exists
-              absHref = appBase + prefix + '/' + href;
-            } else {
-              href = beginsWithPrefix ? href.substr(prefix.length) : href;
-              // 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('/');
-            }
+          var appBaseNoFile = stripFile(appBase);
+          var html5Url = appBase + $location.url().substr(1);
+          var baseUri = baseHref ? urlResolveShim(baseHref, appBase) : html5Url;
+          var appUrl;
+          if (appUrl = beginsWith(prefix + '/', href)) {
+            // hashbang beginning with / refers to appbase
+            absHref = urlResolveShim(appBaseNoFile + appUrl);
+          } else if (appUrl = beginsWith(prefix, href)) {
+            // hashbang relative path
+            absHref = urlResolveShim(appUrl, baseUri);
+          } else if (href[0] == '#') {
+            // local anchor
+            absHref = appBase + prefix + ($location.path() || '/') + href;
+          } else {
+            // relative path
+            absHref = urlResolveShim(href, baseUri);
           }
         }
       }
@@ -779,5 +764,59 @@ function $LocationProvider(){
     function afterLocationChange(oldUrl) {
       $rootScope.$broadcast('$locationChangeSuccess', $location.absUrl(), oldUrl);
     }
+
+    // Similar to URL(URL, base) of URLUtils
+    function urlResolveShim(url, base) {
+      var absHref;
+      if (url.indexOf('//') >= 0) {
+        absHref = url;
+      } else if (url.charAt(0) === '/') {
+        absHref = serverBase(base) + url;
+      } else {
+        absHref = stripFile(base) + url;
+      }
+
+      var resolvedUrl = urlResolve(absHref);
+      var hash = resolvedUrl.hash ? '#' + resolvedUrl.hash : '';
+      var search = resolvedUrl.search;
+      var path = resolvedUrl.pathname;
+      var normalizedPath = normalizePath(path); // only for IE7 compatibility
+      return serverBase(resolvedUrl.href) + normalizedPath + (search ? '?' + search : '') + hash;
+    }
+
+    function normalizePath(path) {
+      path = path || '';
+      var inputSegments = path.split('/');
+      var outputSegments = [];
+      var inputSegment;
+      for (var i = 0; i < inputSegments.length; i++) {
+        inputSegment = inputSegments[i];
+
+        if ((inputSegment.length === 0)
+            || (inputSegment == '.')) {
+          // Do nothing
+          continue;
+        } else if (inputSegment == '..') {
+            if (outputSegments.length) {
+                outputSegments.pop();
+            }
+        } else {
+            outputSegments.push(inputSegment);
+        }
+      }
+
+      var outputSegment, output = '';
+      for (i = 0; i < outputSegments.length; i++) {
+        outputSegment = outputSegments[i];
+        output += '/' + outputSegment;
+      }
+
+      if (path.lastIndexOf('/') == path.length - 1) {
+          // path.endsWith("/") || path.equals("")
+          output += '/';
+      }
+
+      return output;
+    }
 }];
 }

test/ng/locationSpec.js

@@ -1203,10 +1203,15 @@ describe('$location', function() {
         initBrowser(false, true),
         initLocation(),
         function($browser, $location) {
+          $location.path('/some/');
+          expect($browser.url(), 'http://host.com/#!/some/');
+          browserTrigger(link, 'click');
+          expectRewriteTo($browser, 'http://host.com/#!/some/link');
+
           $location.path('/some');
           expect($browser.url(), 'http://host.com/#!/some');
           browserTrigger(link, 'click');
-          expectRewriteTo($browser, 'http://host.com/#!/some/link');
+          expectRewriteTo($browser, 'http://host.com/#!/link');
         }
       );
     });
@@ -1254,15 +1259,29 @@ describe('$location', function() {
     });
 
 
-    it('should rewrite relative hashbang links when history enabled on old browser', function() {
-      configureService('#!link', true, false, true);
+    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#!/some/link');
+          expectRewriteTo($browser, 'http://host.com/base/index.html#!/link');
+        }
+      );
+    });
+
+
+    it('should rewrite relative hashbang links with respect to base when history enabled on old browser', function() {
+      configureService('#!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');
         }
       );
     });