diff options
| author | Dillon Welch <daw0328@gmail.com> | 2017-11-03 19:58:28 -0700 |
|---|---|---|
| committer | Dillon Welch <daw0328@gmail.com> | 2017-11-03 19:58:28 -0700 |
| commit | 0f28957edd6a9c281491c854b455180efc040a1c (patch) | |
| tree | 577d46d88937d4cc811e6860ce3cbdb2a1dad27a /actionview/app | |
| parent | ec13ef75260f6d143e947b0e5176e35e4c1229c2 (diff) | |
| parent | 9ec67362054e874ed905310a79b670941fa397af (diff) | |
| download | rails-0f28957edd6a9c281491c854b455180efc040a1c.tar.gz rails-0f28957edd6a9c281491c854b455180efc040a1c.tar.bz2 rails-0f28957edd6a9c281491c854b455180efc040a1c.zip | |
Merge remote-tracking branch 'upstream/master' into nofollow-change
Diffstat (limited to 'actionview/app')
| -rw-r--r-- | actionview/app/assets/javascripts/rails-ujs/utils/ajax.coffee | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/app/assets/javascripts/rails-ujs/utils/ajax.coffee b/actionview/app/assets/javascripts/rails-ujs/utils/ajax.coffee index 4d7848e162..cc0e037428 100644 --- a/actionview/app/assets/javascripts/rails-ujs/utils/ajax.coffee +++ b/actionview/app/assets/javascripts/rails-ujs/utils/ajax.coffee @@ -21,7 +21,7 @@ Rails.ajax = (options) -> options.error?(response, xhr.statusText, xhr) options.complete?(xhr, xhr.statusText) - unless options.beforeSend?(xhr, options) + if options.beforeSend? && !options.beforeSend(xhr, options) return false if xhr.readyState is XMLHttpRequest.OPENED |