Permalink
Browse files

Fixed escaping of :method option in remote_form_tag #1218 [Rick Olson]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1328 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent c8b4cf6 commit 7160ab1c18738ad357b68922b23ef47b204eef98 @dhh dhh committed May 19, 2005
Showing with 7 additions and 1 deletion.
  1. +2 −0 actionpack/CHANGELOG
  2. +5 −1 actionpack/lib/action_view/helpers/javascript_helper.rb
View
@@ -1,5 +1,7 @@
*SVN*
+* Fixed escaping of :method option in remote_form_tag #1218 [Rick Olson]
+
* Added Serbia and Montenegro to the country_select #1239 [todd@robotcoop.com]
* Fixed Request#remote_ip in testing #1251 [bitsweat]
@@ -193,7 +193,7 @@ def options_for_ajax(options)
js_options = build_callbacks(options)
js_options['asynchronous'] = options[:type] != :synchronous
- js_options['method'] = options[:method] if options[:method]
+ js_options['method'] = method_option_to_s(options[:method]) if options[:method]
js_options['insertion'] = "Insertion.#{options[:position].to_s.camelize}" if options[:position]
if options[:form]
@@ -205,6 +205,10 @@ def options_for_ajax(options)
'{' + js_options.map {|k, v| "#{k}:#{v}"}.join(', ') + '}'
end
+ def method_option_to_s(method)
+ (method.is_a?(String) and !method.index("'").nil?) ? method : "'#{method}'"
+ end
+
def build_observer(klass, name, options = {})
options[:with] ||= 'value' if options[:update]
callback = remote_function(options)

0 comments on commit 7160ab1

Please sign in to comment.