Changeset 8879

Timestamp:

02/16/08 00:07:52 (5 months ago)

Author:

nzkoz

Message:

Ensure that :confirm doesn't need extra quotes when using drop_receiving_element. Closes #8299 [thechrisoshow]

Files:

• trunk/actionpack/lib/action_view/helpers/scriptaculous_helper.rb (modified) (1 diff)
• trunk/actionpack/test/template/scriptaculous_helper_test.rb (modified) (1 diff)

trunk/actionpack/lib/action_view/helpers/scriptaculous_helper.rb

@@ -193 +193 @@
-        options[:hoverclass] = "'#{options[:hoverclass]}'" if options[:hoverclass]
-        
+        # Confirmation happens during the onDrop callback, so it can be removed from the options
+        options.delete(:confirm) if options[:confirm]
+
-        %(Droppables.add(#{element_id.to_json}, #{options_for_javascript(options)});)
-      end

trunk/actionpack/test/template/scriptaculous_helper_test.rb

@@ -89 +89 @@
-    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nDroppables.add(\"droptarget1\", {accept:['tshirts','mugs'], onDrop:function(element){new Ajax.Updater('infobox', 'http://www.example.com/', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)})}})\n//]]>\n</script>),
-      drop_receiving_element("droptarget1", :accept => ['tshirts','mugs'], :update => 'infobox')
+    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nDroppables.add("droptarget1", {hoverclass:'dropready', onDrop:function(element){if (confirm('Are you sure?')) { new Ajax.Request('http://www.example.com/update_drop', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)}); }}})\n//]]>\n</script>),
+    drop_receiving_element('droptarget1', :hoverclass=>'dropready', :url=>{:action=>'update_drop'}, :confirm => 'Are you sure?')
+
-  end
-
-  def protect_against_forgery?
-    false