[fixed] <Link href> when using HashHistory

danieljuhl · Jun 19, 2015 · 178efc3 · 178efc3
1 parent ede0b53
commit 178efc3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/modules/HashHistory.js b/modules/HashHistory.js
@@ -164,8 +164,8 @@ class HashHistory extends DOMHistory {
     this._notifyChange();
   }
 
-  makeHref(pathname, query) {
-    return '#' + super.makeHref(pathname, query);
+  makeHref(path) {
+    return '#' + path;
   }
 
 }

diff --git a/modules/RouterContextMixin.js b/modules/RouterContextMixin.js
@@ -71,7 +71,13 @@ var RouterContextMixin = {
    * pathname and query.
    */
   makeHref(pathname, query) {
-    return this.makePath(pathname, query);
+    var path = this.makePath(pathname, query);
+    var { history } = this.props;
+
+    if (history && history.makeHref)
+      return history.makeHref(path);
+
+    return path;
   },
 
   /**

diff --git a/modules/__tests__/Link-test.js b/modules/__tests__/Link-test.js
@@ -64,12 +64,12 @@ describe('A <Link>', function () {
     });
 
     render((
-      <Router history={new HashHistory()}>
+      <Router history={new HashHistory}>
         <Route path="/" component={LinkWrapper}/>
       </Router>
     ), div, function () {
       var a = div.querySelector('a');
-      expect(a.getAttribute('href')).toEqual('/#/hello/michael?the=query');
+      expect(a.getAttribute('href')).toEqual('#/hello/michael?the=query');
     });
   });