Clean up PR #169

Adds the ability to specify <Routes location={HashLocation}> instead
of just using a string. Also, use Browserify's events module instead
of event-emitter.

Also, replaces URLStore with PathStore which takes a location object
instead of using a string to identify which location it's using.

Author: mjackson

modules/components/Routes.js

@@ -1,23 +1,34 @@
 var React = require('react');
 var warning = require('react/lib/warning');
-var ExecutionEnvironment = require('react/lib/ExecutionEnvironment');
-var mergeProperties = require('../helpers/mergeProperties');
+var Promise = require('es6-promise').Promise;
 var goBack = require('../helpers/goBack');
+var mergeProperties = require('../helpers/mergeProperties');
 var replaceWith = require('../helpers/replaceWith');
 var transitionTo = require('../helpers/transitionTo');
-var Location = require('../helpers/Location');
 var Route = require('../components/Route');
 var Path = require('../helpers/Path');
+var HashLocation = require('../locations/HashLocation');
+var HistoryLocation = require('../locations/HistoryLocation');
+var RefreshLocation = require('../locations/RefreshLocation');
 var ActiveStore = require('../stores/ActiveStore');
+var PathStore = require('../stores/PathStore');
 var RouteStore = require('../stores/RouteStore');
-var URLStore = require('../stores/URLStore');
-var Promise = require('es6-promise').Promise;
 
 /**
  * The ref name that can be used to reference the active route component.
  */
 var REF_NAME = '__activeRoute__';
 
+/**
+ * A hash of { name, location } pairs of all locations.
+ */
+var NAMED_LOCATIONS = {
+  hash: HashLocation,
+  history: HistoryLocation,
+  refresh: RefreshLocation,
+  disabled: RefreshLocation // TODO: Remove
+};
+
 /**
  * The <Routes> component configures the route hierarchy and renders the
  * route matching the current location when rendered into a document.
@@ -55,48 +66,54 @@ var Routes = React.createClass({
 
   propTypes: {
     preserveScrollPosition: React.PropTypes.bool,
-    location: function(props, propName, componentName) {
+    location: function (props, propName, componentName) {
       var location = props[propName];
-      if (!Location[location]) {
-        return new Error('No matching location: "' + location +
-          '".  Must be one of: ' + Object.keys(Location) +
-          '. See: ' + componentName);
-      }
+
+      if (typeof location === 'string' && !(location in NAMED_LOCATIONS))
+        return new Error('Unknown location "' + location + '", see ' + componentName);
     }
   },
 
   getDefaultProps: function () {
     return {
-      location: 'hash',
-      preserveScrollPosition: false
+      preserveScrollPosition: false,
+      location: HashLocation
     };
   },
 
   getInitialState: function () {
     return {};
   },
 
+  getLocation: function () {
+    var location = this.props.location;
+
+    if (typeof location === 'string')
+      return NAMED_LOCATIONS[location];
+
+    return location;
+  },
+
   componentWillMount: function () {
     React.Children.forEach(this.props.children, function (child) {
       RouteStore.registerRoute(child);
     });
 
-    if (!URLStore.isSetup() && ExecutionEnvironment.canUseDOM)
-      URLStore.setup(this.props.location);
+    PathStore.setup(this.getLocation());
 
-    URLStore.addChangeListener(this.handleRouteChange);
+    PathStore.addChangeListener(this.handlePathChange);
   },
 
   componentDidMount: function () {
-    this.dispatch(URLStore.getCurrentPath());
+    this.handlePathChange();
   },
 
   componentWillUnmount: function () {
-    URLStore.removeChangeListener(this.handleRouteChange);
+    PathStore.removeChangeListener(this.handlePathChange);
   },
 
-  handleRouteChange: function () {
-    this.dispatch(URLStore.getCurrentPath());
+  handlePathChange: function () {
+    this.dispatch(PathStore.getCurrentPath());
   },
 
   /**

modules/helpers/DisabledLocation.js

@@ -1,7 +1,10 @@
-var URLStore = require('../stores/URLStore');
+var PathStore = require('../stores/PathStore');
 
+/**
+ * Transitions to the previous URL.
+ */
 function goBack() {
-  URLStore.back();
+  PathStore.pop();
 }
 
 module.exports = goBack;

modules/helpers/HashLocation.js

@@ -1,14 +1,15 @@
-var URLStore = require('../stores/URLStore');
+var HashLocation = require('../locations/HashLocation');
+var PathStore = require('../stores/PathStore');
 var makePath = require('./makePath');
 
 /**
  * Returns a string that may safely be used as the href of a
  * link to the route with the given name.
  */
-function makeHref(routeName, params, query) {
-  var path = makePath(routeName, params, query);
+function makeHref(to, params, query) {
+  var path = makePath(to, params, query);
 
-  if (URLStore.getLocation() === 'hash')
+  if (PathStore.getLocation() === HashLocation)
     return '#' + path;
 
   return path;

modules/helpers/HistoryLocation.js

@@ -1,12 +1,12 @@
-var URLStore = require('../stores/URLStore');
+var PathStore = require('../stores/PathStore');
 var makePath = require('./makePath');
 
 /**
  * Transitions to the URL specified in the arguments by replacing
  * the current URL in the history stack.
  */
 function replaceWith(to, params, query) {
-  URLStore.replace(makePath(to, params, query));
+  PathStore.replace(makePath(to, params, query));
 }
 
 module.exports = replaceWith;

modules/helpers/Location.js

@@ -0,0 +1,16 @@
+function supportsHistory() {
+  /*! taken from modernizr
+   * https://github.com/Modernizr/Modernizr/blob/master/LICENSE
+   * https://github.com/Modernizr/Modernizr/blob/master/feature-detects/history.js
+   */
+  var ua = navigator.userAgent;
+  if ((ua.indexOf('Android 2.') !== -1 ||
+      (ua.indexOf('Android 4.0') !== -1)) &&
+      ua.indexOf('Mobile Safari') !== -1 &&
+      ua.indexOf('Chrome') === -1) {
+    return false;
+  }
+  return (window.history && 'pushState' in window.history);
+}
+
+module.exports = supportsHistory;