diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2017-05-29 13:37:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-29 13:37:53 -0500 |
| commit | cbf378bc2725afe55e81d74bf97be7d484309863 (patch) | |
| tree | 9ca56d71ccd8dea6c8fccf094e4e2afcd3b9ce40 /actionview/app | |
| parent | e7a33a5ed74cc0987544396f0742110fa5a5e228 (diff) | |
| parent | f1a740ef3cadd2c6cc5ceceb6fd46e2e6825b12b (diff) | |
| download | rails-cbf378bc2725afe55e81d74bf97be7d484309863.tar.gz rails-cbf378bc2725afe55e81d74bf97be7d484309863.tar.bz2 rails-cbf378bc2725afe55e81d74bf97be7d484309863.zip | |
Merge pull request #29151 from onemanstartup/jquery_slim_fix
Check for jQuery ajax
Diffstat (limited to 'actionview/app')
| -rw-r--r-- | actionview/app/assets/javascripts/rails-ujs/start.coffee | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/app/assets/javascripts/rails-ujs/start.coffee b/actionview/app/assets/javascripts/rails-ujs/start.coffee index 5746a22287..55595ac96f 100644 --- a/actionview/app/assets/javascripts/rails-ujs/start.coffee +++ b/actionview/app/assets/javascripts/rails-ujs/start.coffee @@ -9,7 +9,7 @@ } = Rails # For backward compatibility -if jQuery? and not jQuery.rails +if jQuery? and jQuery.ajax? and not jQuery.rails jQuery.rails = Rails jQuery.ajaxPrefilter (options, originalOptions, xhr) -> CSRFProtection(xhr) unless options.crossDomain |