Avoid calling pushState with an empty url.

okonet · Jul 5, 2013 · 15b7d77 · 15b7d77
1 parent 151bd73
commit 15b7d77
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/backbone.js b/backbone.js
@@ -1480,7 +1480,7 @@
       var url = this.root + fragment;
 
       // Don't include a trailing slash on the root.
-      if (fragment === '') url = url.slice(0, -1);
+      if (fragment === '' && url !== '/') url = url.slice(0, -1);
 
       // If pushState is available, we use it to set the fragment as a real URL.
       if (this._hasPushState) {

diff --git a/test/router.js b/test/router.js
@@ -671,4 +671,19 @@ $(document).ready(function() {
     Backbone.history.navigate('');
   });
 
+  test('#2656 - No trailing slash on root.', 1, function() {
+    Backbone.history.stop();
+    Backbone.history = _.extend(new Backbone.History, {
+      location: location,
+      history: {
+        pushState: function(state, title, url){
+          strictEqual(url, '/');
+        }
+      }
+    });
+    location.replace('http://example.com/path');
+    Backbone.history.start({pushState: true});
+    Backbone.history.navigate('');
+  });
+
 });