Ticket #11499: regexp_support_for_format_option_of_sortable_element.diff

actionpack/test/template/scriptaculous_helper_test.rb

@@ -70 +70 @@
-      sortable_element("mylist", :containment => ['list1','list2'], :constraint => "horizontal", :url => { :action => "order" })
-    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nSortable.create(\"mylist\", {constraint:'horizontal', containment:'list1', onUpdate:function(){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize(\"mylist\")})}})\n//]]>\n</script>), 
-      sortable_element("mylist", :containment => 'list1', :constraint => "horizontal", :url => { :action => "order" })
+    # Backwards-compatibility test: passing :format as a string.
+    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nSortable.create(\"mylist\", {format:/[^-]+-(\\d+)/, onUpdate:function(){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize(\"mylist\")})}})\n//]]>\n</script>),
+      sortable_element("mylist", :url => { :action => "order" }, :format => '/[^-]+-(\d+)/')
+    # Passing :format as regexp should yield the same result.
+    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nSortable.create(\"mylist\", {format:/[^-]+-(\\d+)/, onUpdate:function(){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize(\"mylist\")})}})\n//]]>\n</script>),
+      sortable_element("mylist", :url => { :action => "order" }, :format => /[^-]+-(\d+)/)
-  end
-  
-  def test_draggable_element

actionpack/lib/action_view/helpers/scriptaculous_helper.rb

@@ -148 +148 @@
-          options[option] = "'#{options[option]}'" if options[option]
-        end
-  
+        options[:format] = options[:format].inspect if options[:format].kind_of?(Regexp)
+
-        options[:containment] = array_or_string_for_javascript(options[:containment]) if options[:containment]
-        options[:only] = array_or_string_for_javascript(options[:only]) if options[:only]
-