Skip to content

Commit 634254e

Browse files
author
Robert Mosolgo
committed
Merge pull request #512 from jakegavin/react-15-0-1
React 15.0.1
2 parents e7871a6 + fc5c889 commit 634254e

34 files changed

+99266
-130277
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#### Breaking Changes
44

55
#### New Features
6+
- Update to React 15.0.1
67

78
#### Deprecation
89

Rakefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ namespace :react do
3737
copy_react_asset("#{environment}/react-server-with-addons.js", "#{environment}-with-addons/react-server.js")
3838

3939
addons = %w(
40-
addons-clone-with-props
4140
addons-create-fragment
4241
addons-css-transition-group
4342
addons-linked-state-mixin

VERSIONS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ You can control what version of React.js (and JSXTransformer) is used by `react-
99

1010
| Gem | React.js |
1111
|----------|----------|
12-
| master | 0.14.6 |
12+
| master | 15.0.1 |
1313
| 1.6.2 | 0.14.6 |
1414
| 1.6.1 | 0.14.6 |
1515
| 1.6.0 | 0.14.6 |

lib/assets/javascripts/react_ujs_mount.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,7 @@
5757
var propsJson = node.getAttribute(window.ReactRailsUJS.PROPS_ATTR);
5858
var props = propsJson && JSON.parse(propsJson);
5959

60-
// Prefer ReactDOM if defined (introduced in 0.14)
61-
var renderer = (typeof ReactDOM == "object") ? ReactDOM : React;
62-
63-
renderer.render(React.createElement(constructor, props), node);
60+
ReactDOM.render(React.createElement(constructor, props), node);
6461
}
6562
},
6663

@@ -72,9 +69,7 @@
7269
for (var i = 0; i < nodes.length; ++i) {
7370
var node = nodes[i];
7471

75-
// Prefer ReactDOM if defined (introduced in 0.14)
76-
var renderer = (typeof ReactDOM == "object") ? ReactDOM : React;
77-
renderer.unmountComponentAtNode(node);
72+
ReactDOM.unmountComponentAtNode(node);
7873
}
7974
}
8075
};

0 commit comments

Comments
 (0)