aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/app
diff options
context:
space:
mode:
authorWoH <wolfgang.hobmaier@datapweb.de>2018-12-03 18:07:05 +0100
committerWoH <wolfgang.hobmaier@datapweb.de>2018-12-06 09:02:07 +0100
commit257a1a63739f43e59ec43580f969918fa80e290a (patch)
treeedd79384e18ad097de2526e67c92d6f4946a27b9 /actionview/app
parentb86f65a816546ff8eea39d25b62c995c7efc21dc (diff)
downloadrails-257a1a63739f43e59ec43580f969918fa80e290a.tar.gz
rails-257a1a63739f43e59ec43580f969918fa80e290a.tar.bz2
rails-257a1a63739f43e59ec43580f969918fa80e290a.zip
Do not disable previously disabled elements
Diffstat (limited to 'actionview/app')
-rw-r--r--actionview/app/assets/javascripts/rails-ujs/features/disable.coffee2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionview/app/assets/javascripts/rails-ujs/features/disable.coffee b/actionview/app/assets/javascripts/rails-ujs/features/disable.coffee
index a8c692ee62..4cfaead078 100644
--- a/actionview/app/assets/javascripts/rails-ujs/features/disable.coffee
+++ b/actionview/app/assets/javascripts/rails-ujs/features/disable.coffee
@@ -34,6 +34,7 @@ Rails.disableElement = (e) ->
# Replace element's html with the 'data-disable-with' after storing original html
# and prevent clicking on it
disableLinkElement = (element) ->
+ return if getData(element, 'ujs:disabled')
replacement = element.getAttribute('data-disable-with')
if replacement?
setData(element, 'ujs:enable-with', element.innerHTML) # store enabled state
@@ -58,6 +59,7 @@ disableFormElements = (form) ->
formElements(form, Rails.formDisableSelector).forEach(disableFormElement)
disableFormElement = (element) ->
+ return if getData(element, 'ujs:disabled')
replacement = element.getAttribute('data-disable-with')
if replacement?
if matches(element, 'button')