diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/helpers/ajax_helper.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/javascript_helper.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/helpers/ajax_helper.rb b/actionpack/lib/action_view/helpers/ajax_helper.rb index 4081117ad1..9c1d6a722d 100644 --- a/actionpack/lib/action_view/helpers/ajax_helper.rb +++ b/actionpack/lib/action_view/helpers/ajax_helper.rb @@ -1,7 +1,7 @@ module ActionView module Helpers module AjaxHelper - include UrlHelper + include PrototypeHelper def remote_form_for(record_or_name_or_array, *args, &proc) options = args.extract_options! @@ -28,7 +28,7 @@ module ActionView attributes.merge!(options) url = url_for(url) if url.is_a?(Hash) - link_to(name, url, attributes) + content_tag(:a, name, attributes.merge(:href => url)) end def button_to_remote(name, options = {}, html_options = {}) diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb index 8f64acf102..9f6ec28a9e 100644 --- a/actionpack/lib/action_view/helpers/javascript_helper.rb +++ b/actionpack/lib/action_view/helpers/javascript_helper.rb @@ -39,7 +39,7 @@ module ActionView JAVASCRIPT_PATH = File.join(File.dirname(__FILE__), 'javascripts') end - include PrototypeHelper + include AjaxHelper::Rails2Compatibility # Returns a link of the given +name+ that will trigger a JavaScript +function+ using the # onclick handler and return false after the fact. |