diff --git a/lib/assets/javascripts/react_ujs.js b/lib/assets/javascripts/react_ujs.js index 656149793..577f07f5a 100644 --- a/lib/assets/javascripts/react_ujs.js +++ b/lib/assets/javascripts/react_ujs.js @@ -422,14 +422,12 @@ module.exports = { module.exports = { // Turbolinks 5+ got rid of named events (?!) setup: function(ujs) { - ujs.handleEvent('DOMContentLoaded', ujs.handleMount) - ujs.handleEvent('turbolinks:render', ujs.handleMount) + ujs.handleEvent('turbolinks:load', ujs.handleMount) ujs.handleEvent('turbolinks:before-render', ujs.handleUnmount) }, teardown: function(ujs) { - ujs.removeEvent('DOMContentLoaded', ujs.handleMount) - ujs.removeEvent('turbolinks:render', ujs.handleMount) + ujs.removeEvent('turbolinks:load', ujs.handleMount) ujs.removeEvent('turbolinks:before-render', ujs.handleUnmount) }, } diff --git a/lib/react/rails/version.rb b/lib/react/rails/version.rb index 8d5498bea..e2413e7cd 100644 --- a/lib/react/rails/version.rb +++ b/lib/react/rails/version.rb @@ -2,6 +2,6 @@ module React module Rails # If you change this, make sure to update VERSIONS.md # and republish the UJS by updating package.json and `bundle exec rake ujs:publish` - VERSION = '2.4.3' + VERSION = '2.4.4.pre' end end diff --git a/package.json b/package.json index b272b52bd..2b79727ba 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react_ujs", - "version": "2.4.3", + "version": "2.4.4-PRE", "description": "Rails UJS for the react-rails gem", "main": "react_ujs/index.js", "files": [ @@ -12,8 +12,5 @@ }, "devDependencies": { "webpack": "^2.3.3" - }, - "dependencies": { - "react_ujs": "^2.4.3" } } diff --git a/react_ujs/dist/react_ujs.js b/react_ujs/dist/react_ujs.js index 656149793..577f07f5a 100644 --- a/react_ujs/dist/react_ujs.js +++ b/react_ujs/dist/react_ujs.js @@ -422,14 +422,12 @@ module.exports = { module.exports = { // Turbolinks 5+ got rid of named events (?!) setup: function(ujs) { - ujs.handleEvent('DOMContentLoaded', ujs.handleMount) - ujs.handleEvent('turbolinks:render', ujs.handleMount) + ujs.handleEvent('turbolinks:load', ujs.handleMount) ujs.handleEvent('turbolinks:before-render', ujs.handleUnmount) }, teardown: function(ujs) { - ujs.removeEvent('DOMContentLoaded', ujs.handleMount) - ujs.removeEvent('turbolinks:render', ujs.handleMount) + ujs.removeEvent('turbolinks:load', ujs.handleMount) ujs.removeEvent('turbolinks:before-render', ujs.handleUnmount) }, } diff --git a/react_ujs/src/events/turbolinks.js b/react_ujs/src/events/turbolinks.js index f912fe6ab..a8d792124 100644 --- a/react_ujs/src/events/turbolinks.js +++ b/react_ujs/src/events/turbolinks.js @@ -1,14 +1,12 @@ module.exports = { // Turbolinks 5+ got rid of named events (?!) setup: function(ujs) { - ujs.handleEvent('DOMContentLoaded', ujs.handleMount) - ujs.handleEvent('turbolinks:render', ujs.handleMount) + ujs.handleEvent('turbolinks:load', ujs.handleMount) ujs.handleEvent('turbolinks:before-render', ujs.handleUnmount) }, teardown: function(ujs) { - ujs.removeEvent('DOMContentLoaded', ujs.handleMount) - ujs.removeEvent('turbolinks:render', ujs.handleMount) + ujs.removeEvent('turbolinks:load', ujs.handleMount) ujs.removeEvent('turbolinks:before-render', ujs.handleUnmount) }, } diff --git a/yarn.lock b/yarn.lock index 498332054..eb4f971d8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1314,12 +1314,6 @@ rc@^1.1.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -react_ujs@^2.4.2, react_ujs@^2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/react_ujs/-/react_ujs-2.4.3.tgz#f35b641f248a155ad3539468c5463734fce4fe4a" - dependencies: - react_ujs "^2.4.2" - read-pkg-up@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"