release v0.11.1

CHANGELOG.md

@@ -1,3 +1,14 @@
+v0.11.1 - Sat, 22 Nov 2014 15:00:37 GMT
+---------------------------------------
+
+- [b75f648](../../commit/b75f648) [fixed] rendering current handlers before rendering root
+- [5695b9a](../../commit/5695b9a) [removed] addHandlerKey
+- [97d7a05](../../commit/97d7a05) [added] ActiveRouteHandler
+- [940a0d0](../../commit/940a0d0) [changed] use `Object.assign` instead of `copyProperties`
+- [f8cb7f9](../../commit/f8cb7f9) [changed] use `Object.assign` instead of `merge`
+- [70b442a](../../commit/70b442a) [added] React 0.12 compatibility
+
+
 v0.11.0 - Sat, 22 Nov 2014 06:03:21 GMT
 ---------------------------------------
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "homepage": "https://github.com/rackt/react-router",
   "authors": [
     "Ryan Florence",

dist/react-router.js

@@ -1434,6 +1434,12 @@ function createRouter(options) {
   var onError = options.onError || defaultErrorHandler;
   var onAbort = options.onAbort || defaultAbortHandler;
   var state = {};
+  var nextState = {};
+
+  function updateState() {
+    state = nextState;
+    nextState = {};
+  }
 
   // Automatically fall back to full page refreshes in
   // browsers that don't support the HTML history API.
@@ -1598,11 +1604,11 @@ function createRouter(options) {
             if (error || transition.isAborted)
               return callback.call(router, error, transition);
 
-            state.path = path;
-            state.action = action;
-            state.routes = nextRoutes;
-            state.params = nextParams;
-            state.query = nextQuery;
+            nextState.path = path;
+            nextState.action = action;
+            nextState.routes = nextRoutes;
+            nextState.params = nextParams;
+            nextState.query = nextQuery;
 
             callback.call(router, null, transition);
           });
@@ -1623,7 +1629,7 @@ function createRouter(options) {
           } else if (transition.isAborted) {
             onAbort.call(router, transition.abortReason, location);
           } else {
-            callback.call(router, router, state);
+            callback.call(router, router, nextState);
           }
         }
 
@@ -1680,10 +1686,12 @@ function createRouter(options) {
     },
 
     getInitialState: function () {
+      updateState();
       return state;
     },
 
     componentWillReceiveProps: function () {
+      updateState();
       this.setState(state);
     },
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "A complete routing library for React.js",
   "main": "./modules/index",
   "repository": {