Merge pull request #512 from jakegavin/react-15-0-1

React 15.0.1

Author: Robert Mosolgo

CHANGELOG.md

@@ -3,6 +3,7 @@
 #### Breaking Changes
 
 #### New Features
+- Update to React 15.0.1
 
 #### Deprecation
 

Rakefile

@@ -37,7 +37,6 @@ namespace :react do
       copy_react_asset("#{environment}/react-server-with-addons.js", "#{environment}-with-addons/react-server.js")
 
       addons = %w(
-        addons-clone-with-props
         addons-create-fragment
         addons-css-transition-group
         addons-linked-state-mixin

VERSIONS.md

@@ -9,7 +9,7 @@ You can control what version of React.js (and JSXTransformer) is used by `react-
 
 | Gem      | React.js |
 |----------|----------|
-| master   | 0.14.6   |
+| master   | 15.0.1   |
 | 1.6.2    | 0.14.6   |
 | 1.6.1    | 0.14.6   |
 | 1.6.0    | 0.14.6   |

lib/assets/javascripts/react_ujs_mount.js

@@ -57,10 +57,7 @@
         var propsJson = node.getAttribute(window.ReactRailsUJS.PROPS_ATTR);
         var props = propsJson && JSON.parse(propsJson);
 
-        // Prefer ReactDOM if defined (introduced in 0.14)
-        var renderer = (typeof ReactDOM == "object") ? ReactDOM : React;
-
-        renderer.render(React.createElement(constructor, props), node);
+        ReactDOM.render(React.createElement(constructor, props), node);
       }
     },
 
@@ -72,9 +69,7 @@
       for (var i = 0; i < nodes.length; ++i) {
         var node = nodes[i];
 
-        // Prefer ReactDOM if defined (introduced in 0.14)
-        var renderer = (typeof ReactDOM == "object") ? ReactDOM : React;
-        renderer.unmountComponentAtNode(node);
+        ReactDOM.unmountComponentAtNode(node);
       }
     }
   };