Move code back into modules dir

Author: mjackson

utils/Cancellation.js renamed to modules/Cancellation.js

@@ -2,6 +2,6 @@
  * Represents a cancellation caused by navigating away
  * before the previous transition has fully resolved.
  */
-function Cancellation() { }
+function Cancellation() {}
 
 module.exports = Cancellation;

utils/History.js renamed to modules/History.js

@@ -3,6 +3,13 @@ var canUseDOM = require('react/lib/ExecutionEnvironment').canUseDOM;
 
 var History = {
 
+  /**
+   * The current number of entries in the history.
+   *
+   * Note: This property is read-only.
+   */
+  length: 1,
+
   /**
    * Sends the browser back one entry in the history.
    */
@@ -17,12 +24,7 @@ var History = {
     History.length -= 1;
 
     window.history.back();
-  },
-
-  /**
-   * The current number of entries in the history.
-   */
-  length: 1
+  }
 
 };
 

mixins/Navigation.js renamed to modules/Navigation.js

@@ -1,4 +1,4 @@
-var React = require('react');
+var PropTypes = require('./PropTypes');
 
 /**
  * A mixin for components that modify the URL.
@@ -21,11 +21,11 @@ var React = require('react');
 var Navigation = {
 
   contextTypes: {
-    makePath: React.PropTypes.func.isRequired,
-    makeHref: React.PropTypes.func.isRequired,
-    transitionTo: React.PropTypes.func.isRequired,
-    replaceWith: React.PropTypes.func.isRequired,
-    goBack: React.PropTypes.func.isRequired
+    makePath: PropTypes.func.isRequired,
+    makeHref: PropTypes.func.isRequired,
+    transitionTo: PropTypes.func.isRequired,
+    replaceWith: PropTypes.func.isRequired,
+    goBack: PropTypes.func.isRequired
   },
 
   /**

mixins/NavigationContext.js renamed to modules/NavigationContext.js

@@ -1,16 +1,16 @@
-var React = require('react');
+var PropTypes = require('./PropTypes');
 
 /**
  * Provides the router with context for Router.Navigation.
  */
 var NavigationContext = {
 
   childContextTypes: {
-    makePath: React.PropTypes.func.isRequired,
-    makeHref: React.PropTypes.func.isRequired,
-    transitionTo: React.PropTypes.func.isRequired,
-    replaceWith: React.PropTypes.func.isRequired,
-    goBack: React.PropTypes.func.isRequired
+    makePath: PropTypes.func.isRequired,
+    makeHref: PropTypes.func.isRequired,
+    transitionTo: PropTypes.func.isRequired,
+    replaceWith: PropTypes.func.isRequired,
+    goBack: PropTypes.func.isRequired
   },
 
   getChildContext: function () {

mixins/FakeNode.js renamed to modules/NonRenderable.js

@@ -1,6 +1,6 @@
 var invariant = require('react/lib/invariant');
 
-var FakeNode = {
+var NonRenderable = {
 
   render: function () {
     invariant(
@@ -12,4 +12,4 @@ var FakeNode = {
 
 };
 
-module.exports = FakeNode;
+module.exports = NonRenderable;

utils/PropTypes.js renamed to modules/PropTypes.js

@@ -1,4 +1,7 @@
-var PropTypes = {
+var assign = require('react/lib/Object.assign');
+var ReactPropTypes = require('react').PropTypes;
+
+var PropTypes = assign({
 
   /**
    * Requires that the value of a prop be falsy.
@@ -8,6 +11,6 @@ var PropTypes = {
       return new Error('<' + componentName + '> may not have a "' + propName + '" prop');
   }
 
-};
+}, ReactPropTypes);
 
 module.exports = PropTypes;

utils/Redirect.js renamed to modules/Redirect.js

@@ -1,14 +1,16 @@
 var React = require('react');
+var PropTypes = require('./PropTypes');
+
+var RouteHandlerMixin = {
 
-module.exports = {
   contextTypes: {
-    getRouteAtDepth: React.PropTypes.func.isRequired,
-    getRouteComponents: React.PropTypes.func.isRequired,
-    routeHandlers: React.PropTypes.array.isRequired
+    getRouteAtDepth: PropTypes.func.isRequired,
+    setRouteComponentAtDepth: PropTypes.func.isRequired,
+    routeHandlers: PropTypes.array.isRequired
   },
 
   childContextTypes: {
-    routeHandlers: React.PropTypes.array.isRequired
+    routeHandlers: PropTypes.array.isRequired
   },
 
   getChildContext: function () {
@@ -17,8 +19,10 @@ module.exports = {
     };
   },
 
-  getRouteDepth: function () {
-    return this.context.routeHandlers.length - 1;
+  getDefaultProps: function () {
+    return {
+      ref: '__routeHandler__'
+    };
   },
 
   componentDidMount: function () {
@@ -30,13 +34,18 @@ module.exports = {
   },
 
   _updateRouteComponent: function () {
-    var depth = this.getRouteDepth();
-    var components = this.context.getRouteComponents();
-    components[depth] = this.refs[this.props.ref || '__routeHandler__'];
+    this.context.setRouteComponentAtDepth(this.getRouteDepth(), this.refs[this.props.ref]);
   },
 
-  getRouteHandler: function (props) {
+  getRouteDepth: function () {
+    return this.context.routeHandlers.length;
+  },
+
+  createChildRouteHandler: function (props) {
     var route = this.context.getRouteAtDepth(this.getRouteDepth());
     return route ? React.createElement(route.handler, props || this.props) : null;
   }
-};
+
+};
+
+module.exports = RouteHandlerMixin;

mixins/RouteHandler.js renamed to modules/RouteHandlerMixin.js

@@ -1,6 +1,6 @@
 var invariant = require('react/lib/invariant');
 var canUseDOM = require('react/lib/ExecutionEnvironment').canUseDOM;
-var getWindowScrollPosition = require('../utils/getWindowScrollPosition');
+var getWindowScrollPosition = require('./utils/getWindowScrollPosition');
 
 function shouldUpdateScroll(state, prevState) {
   if (!prevState)

mixins/Scrolling.js renamed to modules/Scrolling.js

@@ -1,4 +1,4 @@
-var React = require('react');
+var PropTypes = require('./PropTypes');
 
 /**
  * A mixin for components that need to know the path, routes, URL
@@ -21,12 +21,12 @@ var React = require('react');
 var State = {
 
   contextTypes: {
-    getCurrentPath: React.PropTypes.func.isRequired,
-    getCurrentRoutes: React.PropTypes.func.isRequired,
-    getCurrentPathname: React.PropTypes.func.isRequired,
-    getCurrentParams: React.PropTypes.func.isRequired,
-    getCurrentQuery: React.PropTypes.func.isRequired,
-    isActive: React.PropTypes.func.isRequired
+    getCurrentPath: PropTypes.func.isRequired,
+    getCurrentRoutes: PropTypes.func.isRequired,
+    getCurrentPathname: PropTypes.func.isRequired,
+    getCurrentParams: PropTypes.func.isRequired,
+    getCurrentQuery: PropTypes.func.isRequired,
+    isActive: PropTypes.func.isRequired
   },
 
   /**