diff options
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
-rw-r--r-- | actionpack/lib/action_view/helpers/javascript_helper.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index db3ad9662b..5469f779b3 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Allow use of the :with option for submit_to_remote #1936 [jon@instance-design.co.uk] + * AbstractRequest#domain returns nil when host is an ip address #2012 [kevin.clark@gmail.com] * ActionController documentation update #2051 [fbeausoleil@ftml.net] diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb index 76be539332..2bd741bd79 100644 --- a/actionpack/lib/action_view/helpers/javascript_helper.rb +++ b/actionpack/lib/action_view/helpers/javascript_helper.rb @@ -153,7 +153,7 @@ module ActionView # Returns a button input tag that will submit form using XMLHttpRequest in the background instead of regular # reloading POST arrangement. <tt>options</tt> argument is the same as in <tt>form_remote_tag</tt> def submit_to_remote(name, value, options = {}) - options[:with] = 'Form.serialize(this.form)' + options[:with] ||= 'Form.serialize(this.form)' options[:html] ||= {} options[:html][:type] = 'button' |