Fix links in server-side rendering

Author: mjackson

modules/BrowserHistory.js

@@ -38,7 +38,7 @@ export class BrowserHistory extends DOMHistory {
         window.history.replaceState(state, '');
     }
 
-    this.location = this._createLocation(getWindowPath(), state, navigationType);
+    this.location = this.createLocation(getWindowPath(), state, navigationType);
   }
 
   setup() {
@@ -86,7 +86,7 @@ export class BrowserHistory extends DOMHistory {
       state = this._createState(state);
 
       window.history.pushState(state, '', path);
-      this.location = this._createLocation(path, state, NavigationTypes.PUSH);
+      this.location = this.createLocation(path, state, NavigationTypes.PUSH);
       this._notifyChange();
     } else {
       window.location = path;
@@ -99,7 +99,7 @@ export class BrowserHistory extends DOMHistory {
       state = this._createState(state);
 
       window.history.replaceState(state, '', path);
-      this.location = this._createLocation(path, state, NavigationTypes.REPLACE);
+      this.location = this.createLocation(path, state, NavigationTypes.REPLACE);
       this._notifyChange();
     } else {
       window.location.replace(path);

modules/ChangeEmitter.js

@@ -82,7 +82,7 @@ export class HashHistory extends DOMHistory {
   _updateLocation(navigationType) {
     var path = getHashPath();
     var state = this.queryKey ? readState(path, this.queryKey) : null;
-    this.location = this._createLocation(path, state, navigationType);
+    this.location = this.createLocation(path, state, navigationType);
   }
 
   setup() {
@@ -145,7 +145,7 @@ export class HashHistory extends DOMHistory {
     this._ignoreNextHashChange = true;
     window.location.hash = path;
 
-    this.location = this._createLocation(path, state, NavigationTypes.PUSH);
+    this.location = this.createLocation(path, state, NavigationTypes.PUSH);
 
     this._notifyChange();
   }
@@ -159,7 +159,7 @@ export class HashHistory extends DOMHistory {
     this._ignoreNextHashChange = true;
     replaceHashPath(path);
 
-    this.location = this._createLocation(path, state, NavigationTypes.REPLACE);
+    this.location = this.createLocation(path, state, NavigationTypes.REPLACE);
 
     this._notifyChange();
   }

modules/HashHistory.js

@@ -1,9 +1,8 @@
 import invariant from 'invariant';
-import { getPathname, getQueryString, parseQueryString, stringifyQuery } from './URLUtils';
-import ChangeEmitter from './ChangeEmitter';
+import { getPathname, getQueryString, parseQueryString } from './URLUtils';
 import Location from './Location';
 
-var RequiredSubclassMethods = [ 'pushState', 'replaceState', 'go' ];
+var RequiredHistorySubclassMethods = [ 'pushState', 'replaceState', 'go' ];
 
 function createRandomKey() {
   return Math.random().toString(36).substr(2);
@@ -18,22 +17,35 @@ function createRandomKey() {
  * - replaceState(state, path)
  * - go(n)
  */
-class History extends ChangeEmitter {
+class History {
 
   constructor(options={}) {
-    super();
-
-    this.parseQueryString = options.parseQueryString || parseQueryString;
-    this.stringifyQuery = options.stringifyQuery || stringifyQuery;
-    this.location = null;
-
-    RequiredSubclassMethods.forEach(function (method) {
+    RequiredHistorySubclassMethods.forEach(function (method) {
       invariant(
         typeof this[method] === 'function',
         '%s needs a "%s" method',
         this.constructor.name, method
       );
     }, this);
+
+    this.parseQueryString = options.parseQueryString || parseQueryString;
+    this.changeListeners = [];
+    this.location = null;
+  }
+
+  _notifyChange() {
+    for (var i = 0, len = this.changeListeners.length; i < len; ++i)
+      this.changeListeners[i].call(this);
+  }
+
+  addChangeListener(listener) {
+    this.changeListeners.push(listener);
+  }
+
+  removeChangeListener(listener) {
+    this.changeListeners = this.changeListeners.filter(function (li) {
+      return li !== listener;
+    });
   }
 
   back() {
@@ -53,36 +65,13 @@ class History extends ChangeEmitter {
     return state;
   }
 
-  _createLocation(path, state, navigationType) {
+  createLocation(path, state, navigationType) {
     var pathname = getPathname(path);
     var queryString = getQueryString(path);
     var query = queryString ? this.parseQueryString(queryString) : null;
     return new Location(pathname, query, state, navigationType);
   }
 
-  /**
-   * Returns a full URL path from the given pathname and query.
-   */
-  makePath(pathname, query) {
-    if (query) {
-      if (typeof query !== 'string')
-        query = this.stringifyQuery(query);
-
-      if (query !== '')
-        return pathname + '?' + query;
-    }
-
-    return pathname;
-  }
-
-  /**
-   * Returns a string that may safely be used to link to the given
-   * pathname and query.
-   */
-  makeHref(pathname, query) {
-    return this.makePath(pathname, query);
-  }
-
 }
 
 export default History;

modules/History.js

@@ -17,7 +17,7 @@ function createEntry(object) {
  * for testing because it allows you to specify route history
  * entries in the constructor.
  */
-export class MemoryHistory extends History {
+class MemoryHistory extends History {
 
   constructor(entries, current) {
     super();
@@ -47,7 +47,7 @@ export class MemoryHistory extends History {
 
     var currentEntry = entries[current];
 
-    this.location = this._createLocation(
+    this.location = this.createLocation(
       currentEntry.path,
       currentEntry.state
     );
@@ -59,7 +59,7 @@ export class MemoryHistory extends History {
 
     this.current += 1;
     this.entries = this.entries.slice(0, this.current).concat([{ state, path }]);
-    this.location = this._createLocation(path, state, NavigationTypes.PUSH);
+    this.location = this.createLocation(path, state, NavigationTypes.PUSH);
 
     this._notifyChange();
   }
@@ -69,7 +69,7 @@ export class MemoryHistory extends History {
     state = this._createState(state);
 
     this.entries[this.current] = { state, path };
-    this.location = this._createLocation(path, state, NavigationTypes.REPLACE);
+    this.location = this.createLocation(path, state, NavigationTypes.REPLACE);
 
     this._notifyChange();
   }
@@ -87,7 +87,7 @@ export class MemoryHistory extends History {
     this.current += n;
     var currentEntry = this.entries[this.current];
 
-    this.location = this._createLocation(
+    this.location = this.createLocation(
       currentEntry.path,
       currentEntry.state,
       NavigationTypes.POP