Ticket #11537: link_tag_using_delete_javascript_and_target_plus_test.diff

actionpack/test/template/url_helper_test.rb

@@ -202 +202 @@
-      link_to("Destroy", "http://www.example.com", :method => :delete, :href => '#')
-    )
-  end
+  
+  def test_link_tag_using_delete_javascript_and_target
+    assert_dom_equal(
+      "<a href='http://www.thijslangeveld.nl' onclick=\"var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;f.target = this.target;var m = document.createElement('input'); m.setAttribute('type', 'hidden'); m.setAttribute('name', '_method'); m.setAttribute('value', 'delete'); f.appendChild(m);f.submit();return false;\" target=\"_top\">Destroy</a>",
+      link_to("Destroy", "http://www.thijslangeveld.nl", :method => :delete, :target => '_top')
+    )
+  end
-
-  def test_link_tag_using_post_javascript_and_confirm
-    assert_dom_equal(

actionpack/lib/action_view/helpers/url_helper.rb

@@ -442 +442 @@
-        def convert_options_to_javascript!(html_options, url = '')
-          confirm, popup = html_options.delete("confirm"), html_options.delete("popup")
-
- = html_options.delete("method"), html_options['href
+, target = html_options.delete("method"), html_options['href'], html_options['target
-
-          html_options["onclick"] = case
-            when popup && method
@@ -454 +454 @@
-            when confirm
-              "return #{confirm_javascript_function(confirm)};"
-            when method
-
+, target
-            when popup
-              popup_javascript_function(popup) + 'return false;'
-            else
@@ -470 +470 @@
-          popup.is_a?(Array) ? "window.open(this.href,'#{popup.first}','#{popup.last}');" : "window.open(this.href);"
-        end
-
-
+, target = nil
-          action = (href && url.size > 0) ? "'#{url}'" : 'this.href'
-          submit_function =
-            "var f = document.createElement('form'); f.style.display = 'none'; " +
-            "this.parentNode.appendChild(f); f.method = 'POST'; f.action = #{action};"
-
+          if target
+            submit_function << "f.target = this.target;"
+          end
+
-          unless method == :post
-            submit_function << "var m = document.createElement('input'); m.setAttribute('type', 'hidden'); "
-            submit_function << "m.setAttribute('name', '_method'); m.setAttribute('value', '#{method}'); f.appendChild(m);"