From c45909a7460ea07b3476851609ec75575b7d988d Mon Sep 17 00:00:00 2001
From: Michael Jackson <mjijackson@gmail.com>
Date: Wed, 8 Oct 2014 20:55:00 -0700
Subject: [PATCH] Inline error/abort handling

---
 modules/components/Routes.js | 38 +++++-------------------------------
 1 file changed, 5 insertions(+), 33 deletions(-)

diff --git a/modules/components/Routes.js b/modules/components/Routes.js
index 329c86b2fb..18abbd826c 100644
--- a/modules/components/Routes.js
+++ b/modules/components/Routes.js
@@ -1,7 +1,6 @@
 var React = require('react');
 var warning = require('react/lib/warning');
 var invariant = require('react/lib/invariant');
-var canUseDOM = require('react/lib/ExecutionEnvironment').canUseDOM;
 var copyProperties = require('react/lib/copyProperties');
 var HashLocation = require('../locations/HashLocation');
 var reversedArray = require('../utils/reversedArray');
@@ -261,36 +260,6 @@ function computeHandlerProps(matches, query) {
   return props;
 }
 
-var BrowserTransitionHandling = {
-
-  handleError: function (component, error) {
-    throw error; // This error probably originated in a transition hook.
-  },
-
-  handleAbort: function (component, reason) {
-    if (reason instanceof Redirect) {
-      component.replaceWith(reason.to, reason.params, reason.query);
-    } else {
-      component.goBack();
-    }
-  }
-
-};
-
-var ServerTransitionHandling = {
-
-  handleError: function (component, error) {
-    // TODO
-  },
-
-  handleAbort: function (component, reason) {
-    // TODO
-  }
-
-};
-
-var TransitionHandling = canUseDOM ? BrowserTransitionHandling : ServerTransitionHandling;
-
 var ActiveContext = require('../mixins/ActiveContext');
 var LocationContext = require('../mixins/LocationContext');
 var RouteContext = require('../mixins/RouteContext');
@@ -348,9 +317,12 @@ var Routes = React.createClass({
 
     this.dispatch(path, actionType, function (error, abortReason) {
       if (error) {
-        TransitionHandling.handleError(this, error);
+        // Throw so we don't silently swallow errors.
+        throw error; // This error probably originated in a transition hook.
+      } else if (abortReason instanceof Redirect) {
+        this.replaceWith(abortReason.to, abortReason.params, abortReason.query);
       } else if (abortReason) {
-        TransitionHandling.handleAbort(this, abortReason);
+        this.goBack();
       } else {
         this.updateScroll(path, actionType);