diff options
| -rw-r--r-- | actionpack/lib/action_view/helpers/javascript_helper.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb index 6ce1d05e2c..619ce94341 100644 --- a/actionpack/lib/action_view/helpers/javascript_helper.rb +++ b/actionpack/lib/action_view/helpers/javascript_helper.rb @@ -96,12 +96,16 @@ module ActionView var url = arguments[1]; var parameters = arguments[2]; var async = arguments[3]; + var callbacks = arguments[4]; if (async) { - xml_request(url, parameters, true, - { complete: function(request) { - container.innerHTML = request.responseText } - }) + if(!callbacks) callbacks = {} + complete = callbacks['complete'] + callbacks['complete'] = function(request) { + container.innerHTML = request.responseText + if(complete) complete(request) + } + xml_request(url, parameters, true, callbacks) } else { container.innerHTML = xml_request(url, parameters); } |