Move makePath/Href to Router.Transitions

danieljuhl · Oct 3, 2014 · c5d6051 · c5d6051
1 parent 637c0ac
commit c5d6051
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 19 deletions.
diff --git a/modules/mixins/RouteLookup.js b/modules/mixins/RouteLookup.js
@@ -7,8 +7,7 @@ var React = require('react');
 var RouteLookup = {
 
  contextTypes: {
- routeContainer: React.PropTypes.any.isRequired,
- pathDelegate: React.PropTypes.any.isRequired
+ routeContainer: React.PropTypes.any.isRequired
  },
 
  /**
@@ -30,20 +29,6 @@ var RouteLookup = {
  */
  getRouteByName: function (routeName) {
  return this.context.routeContainer.getRouteByName(routeName);
- },
-
- /**
- * See PathDelegate#makePath.
- */
- makePath: function (to, params, query) {
- return this.context.pathDelegate.makePath(to, params, query);
- },
-
- /**
- * See PathDelegate#makeHref.
- */
- makeHref: function (to, params, query) {
- return this.context.pathDelegate.makeHref(to, params, query);
  }
 
 };

diff --git a/modules/mixins/Transitions.js b/modules/mixins/Transitions.js
@@ -9,25 +9,39 @@ var Transitions = {
  pathDelegate: React.PropTypes.any.isRequired
  },
 
+ /**
+ * See PathDelegate#makePath.
+ */
+ makePath: function (to, params, query) {
+ return this.context.pathDelegate.makePath(to, params, query);
+ },
+
+ /**
+ * See PathDelegate#makeHref.
+ */
+ makeHref: function (to, params, query) {
+ return this.context.pathDelegate.makeHref(to, params, query);
+ },
+
  /**
  * See PathDelegate#transitionTo.
  */
  transitionTo: function (to, params, query) {
- return this.context.pathDelegate.transitionTo(to, params, query, this);
+ return this.context.pathDelegate.transitionTo(to, params, query);
  },
 
  /**
  * See PathDelegate#replaceWith.
  */
  replaceWith: function (to, params, query) {
- return this.context.pathDelegate.replaceWith(to, params, query, this);
+ return this.context.pathDelegate.replaceWith(to, params, query);
  },
 
  /**
  * See PathDelegate#goBack.
  */
  goBack: function () {
- return this.context.pathDelegate.goBack(this);
+ return this.context.pathDelegate.goBack();
  }
 
 };