fix($location): prevent navigation if already on the URL

angular · May 2, 2013 · 4bd7bed · 4bd7bed
1 parent fd21c75
commit 4bd7bed
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/src/ng/location.js b/src/ng/location.js
@@ -528,12 +528,14 @@ function $LocationProvider(){
           rewrittenUrl = $location.$$rewrite(absHref);
 
       if (absHref && !elm.attr('target') && rewrittenUrl) {
-        // update location manually
-        $location.$$parse(rewrittenUrl);
-        $rootScope.$apply();
         event.preventDefault();
-        // hack to work around FF6 bug 684208 when scenario runner clicks on links
-        window.angular['ff-684208-preventDefault'] = true;
+        if (rewrittenUrl != initialUrl) {
+          // update location manually
+          $location.$$parse(rewrittenUrl);
+          $rootScope.$apply();
+          // hack to work around FF6 bug 684208 when scenario runner clicks on links
+          window.angular['ff-684208-preventDefault'] = true;
+        }
       }
     });
 

diff --git a/test/ng/locationSpec.js b/test/ng/locationSpec.js
@@ -819,6 +819,19 @@ describe('$location', function() {
     });
 
 
+    it('should do nothing if already on the same URL', function() {
+      configureService('/base/', true, true);
+      inject(
+        initBrowser(),
+        initLocation(),
+        function($browser) {
+          browserTrigger(link, 'click');
+          expectNoRewrite($browser, 'http://host.com/base/');
+        }
+      );
+    });
+
+
     it('should rewrite abs link to new url when history enabled on new browser', function() {
       configureService('/base/link?a#b', true, true);
       inject(