1 files changed, 14 insertions, 49 deletions
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb
index 02d0a88189..06a9d3405a 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 AjaxHelperCompat
+      include PrototypeHelper
 
       # Returns a link of the given +name+ that will trigger a JavaScript +function+ using the
       # onclick handler and return false after the fact.
@@ -187,57 +187,22 @@ module ActionView
         "\n//#{cdata_section("\n#{content}\n//")}\n"
       end
 
-    protected
-      def convert_options_to_javascript!(html_options, url = '')
-        confirm = html_options.delete("confirm")
-
-        if html_options.key?("popup")
-          ActiveSupport::Deprecation.warn(":popup has been deprecated", caller)
-        end
-
-        method, href = html_options.delete("method"), html_options['href']
-
-        if confirm && method
-          add_confirm_to_attributes!(html_options, confirm)
-          add_method_to_attributes!(html_options, method, url)
-        elsif confirm
-          add_confirm_to_attributes!(html_options, confirm)
-        elsif method
-          add_method_to_attributes!(html_options, method, url)
-        end
-      end
-
-      def add_confirm_to_attributes!(html_options, confirm)
-          html_options["data-confirm"] = confirm if confirm
-      end
-
-      def add_method_to_attributes!(html_options, method, url = nil)
-        html_options["rel"] = "nofollow" if method.to_s.downcase == "delete"
-        html_options["data-method"] = method
-        if url.size > 0
-          html_options["data-url"] = url
-        end
-      end
-
-      def add_disable_with_to_attributes!(html_options, disable_with)
-          html_options["data-disable-with"] = disable_with if disable_with
-      end
-
-      def options_for_javascript(options)
-        if options.empty?
-          '{}'
-        else
-          "{#{options.keys.map { |k| "#{k}:#{options[k]}" }.sort.join(', ')}}"
+      protected
+        def options_for_javascript(options)
+          if options.empty?
+            '{}'
+          else
+            "{#{options.keys.map { |k| "#{k}:#{options[k]}" }.sort.join(', ')}}"
+          end
         end
-      end
 
-      def array_or_string_for_javascript(option)
-        if option.kind_of?(Array)
-          "['#{option.join('\',\'')}']"
-        elsif !option.nil?
-          "'#{option}'"
+        def array_or_string_for_javascript(option)
+          if option.kind_of?(Array)
+            "['#{option.join('\',\'')}']"
+          elsif !option.nil?
+            "'#{option}'"
+          end
         end
-      end
     end
   end
 end