Changeset 6930

Timestamp:

06/03/07 14:27:43 (3 years ago)

Author:

madrobby

Message:

Allow JSON-style values for the :with option of observe_field. Closes #8557 [kommen]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view/helpers/prototype_helper.rb (modified) (1 diff)
• trunk/actionpack/test/template/prototype_helper_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Allow JSON-style values for the :with option of observe_field.  Closes #8557 [kommen]
-
-* Remove RAILS_ROOT from backtrace paths.  #8540 [Tim Pope]

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

@@ -699 +699 @@
-    
-      def build_observer(klass, name, options = {})
-
+\{
-          options[:with] = "'#{options[:with]}=' + value"
-        else

trunk/actionpack/test/template/prototype_helper_test.rb

@@ -175 +175 @@
-  end
-  
+  def test_observe_field_using_with_option
+    expected = %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Form.Element.Observer('glass', 300, function(element, value) {new Ajax.Request('http://www.example.com/check_value', {asynchronous:true, evalScripts:true, parameters:'id=' + value})})\n//]]>\n</script>)
+    assert_dom_equal expected, observe_field("glass", :frequency => 5.minutes, :url => { :action => "check_value" }, :with => 'id')
+    assert_dom_equal expected, observe_field("glass", :frequency => 5.minutes, :url => { :action => "check_value" }, :with => "'id=' + value")
+  end
+  
+  def test_observe_field_using_json_in_with_option
+    expected = %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Form.Element.Observer('glass', 300, function(element, value) {new Ajax.Request('http://www.example.com/check_value', {asynchronous:true, evalScripts:true, parameters:{'id':value}})})\n//]]>\n</script>)
+    assert_dom_equal expected, observe_field("glass", :frequency => 5.minutes, :url => { :action => "check_value" }, :with => "{'id':value}")    
+  end
+  
-  def test_observe_field_using_function_for_callback
-    assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Form.Element.Observer('glass', 300, function(element, value) {alert('Element changed')})\n//]]>\n</script>),