diff options
| author | Javan Makhmali <javan@javan.us> | 2018-12-18 10:54:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-18 10:54:12 -0500 |
| commit | 2f6456cbe1da73c13b37e23720caa8716df85e78 (patch) | |
| tree | 23a464b21860cc9011374f77cd8352590d5afbdc /actionview/app/assets/javascripts/rails-ujs/features/disable.coffee | |
| parent | d99984d48c6eeb105c5edd1c142834a5c770f499 (diff) | |
| parent | 257a1a63739f43e59ec43580f969918fa80e290a (diff) | |
| download | rails-2f6456cbe1da73c13b37e23720caa8716df85e78.tar.gz rails-2f6456cbe1da73c13b37e23720caa8716df85e78.tar.bz2 rails-2f6456cbe1da73c13b37e23720caa8716df85e78.zip | |
Merge pull request #34635 from WoH/data-disable-forever
UJS: Do not disable previously disabled elements
Diffstat (limited to 'actionview/app/assets/javascripts/rails-ujs/features/disable.coffee')
| -rw-r--r-- | actionview/app/assets/javascripts/rails-ujs/features/disable.coffee | 2 |
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') |