From 8de181dac638457564677e02c71a9d04fd3e7fde Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 15 Jun 2021 17:31:33 +0200 Subject: [PATCH] Don't attach UJS form submission handlers to Turbo forms (#42476) * Don't attach UJS form submission handlers to Turbo forms Allows for easier migration of apps written for UJS, such that new work can be done with Turbo forms that are marked with data-turbo=true. * Fix duplicate selectors * Proper fix take 2 --- actionview/app/assets/javascripts/rails-ujs.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/actionview/app/assets/javascripts/rails-ujs.coffee b/actionview/app/assets/javascripts/rails-ujs.coffee index 02c16ea1c7..8b665280ce 100644 --- a/actionview/app/assets/javascripts/rails-ujs.coffee +++ b/actionview/app/assets/javascripts/rails-ujs.coffee @@ -18,10 +18,10 @@ inputChangeSelector: 'select[data-remote], input[data-remote], textarea[data-remote]' # Form elements bound by rails-ujs - formSubmitSelector: 'form' + formSubmitSelector: 'form:not([data-turbo=true])', # Form input elements bound by rails-ujs - formInputClickSelector: 'form input[type=submit], form input[type=image], form button[type=submit], form button:not([type]), input[type=submit][form], input[type=image][form], button[type=submit][form], button[form]:not([type])' + formInputClickSelector: 'form:not([data-turbo=true]) input[type=submit], form:not([data-turbo=true]) input[type=image], form:not([data-turbo=true]) button[type=submit], form:not([data-turbo=true]) button:not([type]), input[type=submit][form], input[type=image][form], button[type=submit][form], button[form]:not([type])', # Form input elements disabled during form submission formDisableSelector: 'input[data-disable-with]:enabled, button[data-disable-with]:enabled, textarea[data-disable-with]:enabled, input[data-disable]:enabled, button[data-disable]:enabled, textarea[data-disable]:enabled'