aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/app
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-05-28 17:15:48 +0200
committerGitHub <noreply@github.com>2017-05-28 17:15:48 +0200
commit41c040ad25c864ec589e023e445c3b5ae2ab2de4 (patch)
tree1b927a09fada4293b2d678cb987a9fc514b93a87 /actionview/app
parent87eae9ffa65944697fb16dcdf5e2f1b3747b7a9d (diff)
parent4be50a4a455a027e228dbd8acf09e0fb786929ec (diff)
downloadrails-41c040ad25c864ec589e023e445c3b5ae2ab2de4.tar.gz
rails-41c040ad25c864ec589e023e445c3b5ae2ab2de4.tar.bz2
rails-41c040ad25c864ec589e023e445c3b5ae2ab2de4.zip
Merge pull request #29108 from inopinatus/ujs-sgjs-ie9-support
Fix server-generated JS response processing on IE9
Diffstat (limited to 'actionview/app')
-rw-r--r--actionview/app/assets/javascripts/rails-ujs/utils/ajax.coffee2
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 26df7b9a3f..a653d3af3d 100644
--- a/actionview/app/assets/javascripts/rails-ujs/utils/ajax.coffee
+++ b/actionview/app/assets/javascripts/rails-ujs/utils/ajax.coffee
@@ -14,7 +14,7 @@ AcceptHeaders =
Rails.ajax = (options) ->
options = prepareOptions(options)
xhr = createXHR options, ->
- response = processResponse(xhr.response, xhr.getResponseHeader('Content-Type'))
+ response = processResponse(xhr.response ? xhr.responseText, xhr.getResponseHeader('Content-Type'))
if xhr.status // 100 == 2
options.success?(response, xhr.statusText, xhr)
else