github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor params and with into copat module

Browse Source
This commit is contained in:
Stephen St. Martin
2010-01-24 13:33:07 -05:00
committed by Stefan Penner
parent a5e9d033e8
commit d9af0dfac4
1 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
actionpack/lib/action_view/helpers/ajax_helper.rb
View File

@@ -464,8 +464,11 @@ module ActionView
#
#
def observe_field(name, options = {})
html_options = options.delete(:callbacks)
options[:observed] = name
attributes = extract_observer_attributes!(options)
attributes.merge!(html_options) if html_options
script_decorator(attributes)
end
@@ -512,19 +515,6 @@ module ActionView
url_options = url_options.merge(:escape => false) if url_options.is_a?(Hash)
attributes["data-url"] = escape_javascript(url_for(url_options))
#TODO: Remove all references to prototype - BR
if options.delete(:form)
attributes["data-parameters"] = 'Form.serialize(this)'
elsif submit = options.delete(:submit)
attributes["data-parameters"] = "Form.serialize('#{submit}')"
elsif with = options.delete(:with)
if with !~ /[\{=(.]/
attributes["data-with"] = "'#{with}=' + encodeURIComponent(value)"
else
attributes["data-with"] = with
end
end
purge_unused_attributes!(attributes)
end
@@ -573,6 +563,7 @@ module ActionView
def link_to_remote(name, options, html_options = {})
set_callbacks(options, html_options)
set_conditions(options, html_options)
super
end
@@ -588,6 +579,13 @@ module ActionView
super
end
def observe_field(name, options = {})
html = {}
set_conditions(options, html)
options.merge!(:callbacks => html)
super
end
private
def set_callbacks(options, html)
[:before, :after, :uninitialized, :complete, :failure, :success, :interactive, :loaded, :loading].each do |type|
@@ -600,6 +598,21 @@ module ActionView
end
end
end
def set_conditions(options, html)
#TODO: Remove all references to prototype - BR
if options.delete(:form)
html["data-parameters"] = 'Form.serialize(this)'
elsif submit = options.delete(:submit)
html["data-parameters"] = "Form.serialize('#{submit}')"
elsif with = options.delete(:with)
if with !~ /[\{=(.]/
html["data-with"] = "'#{with}=' + encodeURIComponent(value)"
else
html["data-with"] = with
end
end
end
end
end
end