Skip to content

Commit 1141e3a

Browse files
committed
2.2.0
1 parent 4c3482b commit 1141e3a

File tree

7 files changed

+109
-75
lines changed

7 files changed

+109
-75
lines changed

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@
88

99
#### Bug Fixes
1010

11+
## 2.2.0
12+
13+
#### New Features
14+
15+
- Improve error handling when components aren't found #704
16+
17+
#### Bug Fixes
18+
19+
- Camelize filename when generating for webpack #703
20+
- Include node module boilerplate when generating for webpack #710
21+
- Don't look for non-existent `Turbolinks.EVENTS` #708
22+
1123
## 2.1.0 (April 18, 2017)
1224

1325
#### New Features

VERSIONS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ You can control what version of React.js (and JSXTransformer) is used by `react-
1010
| Gem | React.js |
1111
|----------|----------|
1212
| master | 15.4.2 |
13+
| 2.2.0 | 15.4.2 |
1314
| 2.1.0 | 15.4.2 |
1415
| 2.0.2 | 15.4.2 |
1516
| 2.0.0 | 15.4.2 |

lib/assets/javascripts/react_ujs.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,9 @@ var turbolinksClassicEvents = __webpack_require__(10)
119119
module.exports = function(ujs) {
120120
if (ujs.handleEvent) {
121121
// We're calling this a second time -- remove previous handlers
122-
turbolinksClassicEvents.teardown(ujs)
122+
if (typeof Turbolinks.EVENTS !== "undefined") {
123+
turbolinksClassicEvents.teardown(ujs);
124+
}
123125
turbolinksEvents.teardown(ujs);
124126
turbolinksClassicDeprecatedEvents.teardown(ujs);
125127
pjaxEvents.teardown(ujs);

lib/react/rails/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ module React
22
module Rails
33
# If you change this, make sure to update VERSIONS.md
44
# and republish the UJS by updating package.json and `bundle exec rake ujs:publish`
5-
VERSION = "2.1.0"
5+
VERSION = "2.2.0"
66
end
77
end

react_ujs/dist/react_ujs.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,9 @@ var turbolinksClassicEvents = __webpack_require__(10)
119119
module.exports = function(ujs) {
120120
if (ujs.handleEvent) {
121121
// We're calling this a second time -- remove previous handlers
122-
turbolinksClassicEvents.teardown(ujs)
122+
if (typeof Turbolinks.EVENTS !== "undefined") {
123+
turbolinksClassicEvents.teardown(ujs);
124+
}
123125
turbolinksEvents.teardown(ujs);
124126
turbolinksClassicDeprecatedEvents.teardown(ujs);
125127
pjaxEvents.teardown(ujs);

react_ujs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react_ujs",
3-
"version": "2.1.0",
3+
"version": "2.2.0",
44
"description": "Rails UJS for the react-rails gem",
55
"main": "index.js",
66
"repository": "reactjs/react-rails",

0 commit comments

Comments
 (0)