Use ES6 class/object notation

Author: mjackson

modules/locations/HashLocation.js

@@ -60,7 +60,7 @@ function onHashChange() {
  */
 var HashLocation = {
 
-  addChangeListener: function (listener) {
+  addChangeListener(listener) {
     _changeListeners.push(listener);
 
     // Do this BEFORE listening for hashchange.
@@ -77,7 +77,7 @@ var HashLocation = {
     }
   },
 
-  removeChangeListener: function(listener) {
+  removeChangeListener(listener) {
     _changeListeners = _changeListeners.filter(function (l) {
       return l !== listener;
     });
@@ -93,26 +93,26 @@ var HashLocation = {
     }
   },
 
-  push: function (path) {
+  push(path) {
     _actionType = LocationActions.PUSH;
     window.location.hash = path;
   },
 
-  replace: function (path) {
+  replace(path) {
     _actionType = LocationActions.REPLACE;
     window.location.replace(
       window.location.pathname + window.location.search + '#' + path
     );
   },
 
-  pop: function () {
+  pop() {
     _actionType = LocationActions.POP;
     History.back();
   },
 
   getCurrentPath: getHashPath,
 
-  toString: function () {
+  toString() {
     return '<HashLocation>';
   }
 

modules/locations/HistoryLocation.js

@@ -37,7 +37,7 @@ function onPopState(event) {
  */
 var HistoryLocation = {
 
-  addChangeListener: function (listener) {
+  addChangeListener(listener) {
     _changeListeners.push(listener);
 
     if (!_isListening) {
@@ -51,7 +51,7 @@ var HistoryLocation = {
     }
   },
 
-  removeChangeListener: function(listener) {
+  removeChangeListener(listener) {
     _changeListeners = _changeListeners.filter(function (l) {
       return l !== listener;
     });
@@ -67,13 +67,13 @@ var HistoryLocation = {
     }
   },
 
-  push: function (path) {
+  push(path) {
     window.history.pushState({ path: path }, '', path);
     History.length += 1;
     notifyChange(LocationActions.PUSH);
   },
 
-  replace: function (path) {
+  replace(path) {
     window.history.replaceState({ path: path }, '', path);
     notifyChange(LocationActions.REPLACE);
   },
@@ -82,7 +82,7 @@ var HistoryLocation = {
 
   getCurrentPath: getWindowPath,
 
-  toString: function () {
+  toString() {
     return '<HistoryLocation>';
   }
 

modules/locations/RefreshLocation.js

@@ -8,19 +8,19 @@ var History = require('../History');
  */
 var RefreshLocation = {
 
-  push: function (path) {
+  push(path) {
     window.location = path;
   },
 
-  replace: function (path) {
+  replace(path) {
     window.location.replace(path);
   },
 
   pop: History.back,
 
   getCurrentPath: HistoryLocation.getCurrentPath,
 
-  toString: function () {
+  toString() {
     return '<RefreshLocation>';
   }
 

modules/locations/StaticLocation.js

@@ -9,20 +9,26 @@ function throwCannotModify() {
  * stateless environments like servers where there is no path history,
  * only the path that was used in the request.
  */
-function StaticLocation(path) {
-  this.path = path;
+class StaticLocation {
+
+  constructor(path) {
+    this.path = path;
+  }
+
+  getCurrentPath() {
+    return this.path;
+  }
+
+  toString() {
+    return `<StaticLocation path="${this.path}">`;
+  }
+
 }
 
+// TODO: Include these in the above class definition
+// once we can use ES7 property initializers.
 StaticLocation.prototype.push = throwCannotModify;
 StaticLocation.prototype.replace = throwCannotModify;
 StaticLocation.prototype.pop = throwCannotModify;
 
-StaticLocation.prototype.getCurrentPath = function () {
-  return this.path;
-};
-
-StaticLocation.prototype.toString = function () {
-  return '<StaticLocation path="' + this.path + '">';
-};
-
 module.exports = StaticLocation;

modules/locations/TestLocation.js

@@ -5,62 +5,68 @@ var History = require('../History');
 /**
  * A location that is convenient for testing and does not require a DOM.
  */
-function TestLocation(history) {
-  this.history = history || [];
-  this.listeners = [];
-  this._updateHistoryLength();
-}
+class TestLocation {
+
+  constructor(history) {
+    this.history = history || [];
+    this.listeners = [];
+    this._updateHistoryLength();
+  }
+
+  get needsDOM() {
+    return false;
+  }
+
+  _updateHistoryLength() {
+    History.length = this.history.length;
+  }
+
+  _notifyChange(type) {
+    for (var i = 0, len = this.listeners.length; i < len; ++i)
+      this.listeners[i].call(this, { path: this.getCurrentPath(), type: type });
+  }
+
+  addChangeListener(listener) {
+    this.listeners.push(listener);
+  }
+
+  removeChangeListener(listener) {
+    this.listeners = this.listeners.filter(function (l) {
+      return l !== listener;
+    });
+  }
+
+  push(path) {
+    this.history.push(path);
+    this._updateHistoryLength();
+    this._notifyChange(LocationActions.PUSH);
+  }
 
-TestLocation.prototype.needsDOM = false;
-
-TestLocation.prototype._updateHistoryLength = function () {
-  History.length = this.history.length;
-};
-
-TestLocation.prototype._notifyChange = function (type) {
-  for (var i = 0, len = this.listeners.length; i < len; ++i)
-    this.listeners[i].call(this, { path: this.getCurrentPath(), type: type });
-};
-
-TestLocation.prototype.addChangeListener = function (listener) {
-  this.listeners.push(listener);
-};
-
-TestLocation.prototype.removeChangeListener = function (listener) {
-  this.listeners = this.listeners.filter(function (l) {
-    return l !== listener;
-  });
-};
-
-TestLocation.prototype.push = function (path) {
-  this.history.push(path);
-  this._updateHistoryLength();
-  this._notifyChange(LocationActions.PUSH);
-};
-
-TestLocation.prototype.replace = function (path) {
-  invariant(
-    this.history.length,
-    'You cannot replace the current path with no history'
-  );
-
-  this.history[this.history.length - 1] = path;
-
-  this._notifyChange(LocationActions.REPLACE);
-};
-
-TestLocation.prototype.pop = function () {
-  this.history.pop();
-  this._updateHistoryLength();
-  this._notifyChange(LocationActions.POP);
-};
-
-TestLocation.prototype.getCurrentPath = function () {
-  return this.history[this.history.length - 1];
-};
-
-TestLocation.prototype.toString = function () {
-  return '<TestLocation>';
-};
+  replace(path) {
+    invariant(
+      this.history.length,
+      'You cannot replace the current path with no history'
+    );
+
+    this.history[this.history.length - 1] = path;
+
+    this._notifyChange(LocationActions.REPLACE);
+  }
+
+  pop() {
+    this.history.pop();
+    this._updateHistoryLength();
+    this._notifyChange(LocationActions.POP);
+  }
+
+  getCurrentPath() {
+    return this.history[this.history.length - 1];
+  }
+
+  toString() {
+    return '<TestLocation>';
+  }
+
+}
 
 module.exports = TestLocation;