Changeset 4235

Timestamp:

04/19/06 18:08:15 (2 years ago)

Author:

sam

Message:

Change link_to_function and button_to_function to (optionally) take an update_page block instead of a JavaScript string. Closes #4804.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view/helpers/javascript_helper.rb (modified) (3 diffs)
• trunk/actionpack/test/template/javascript_helper_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Change link_to_function and button_to_function to (optionally) take an update_page block instead of a JavaScript string. Closes #4804. [zraii@comcast.net, Sam Stephenson]
-
-* Fixed that remote_form_for can leave out the object parameter and default to the instance variable of the object_name, just like form_for [DHH]

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

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/tag_helper'
+require File.dirname(__FILE__) + '/prototype_helper'
-
-module ActionView
@@ -41 +42 @@
-        JAVASCRIPT_PATH = File.join(File.dirname(__FILE__), 'javascripts')
-      end
+
+      include PrototypeHelper
-      
-      # Returns a link that'll trigger a JavaScript +function+ using the 
-      # onclick handler and return false after the fact.
-      #
+      # The +function+ argument can be omitted in favor of an +update_page+
+      # block, which evaluates to a string when the template is rendered
+      # (instead of making an Ajax request first).      
+      #
-      # Examples:
-      #   link_to_function "Greeting", "alert('Hello world!')"
-
-
+
+
+
+
+
+
-        html_options.symbolize_keys!
+        function = update_page(&block) if block_given?
-        content_tag(
-          "a", name, 
@@ -59 +71 @@
-      end
-      
-link
+button
-      # onclick handler.
+      #
+      # The +function+ argument can be omitted in favor of an +update_page+
+      # block, which evaluates to a string when the template is rendered
+      # (instead of making an Ajax request first).      
-      #
-      # Examples:
-      #   button_to_function "Greeting", "alert('Hello world!')"
-
-
+
+
+
+
+
-        html_options.symbolize_keys!
+        function = update_page(&block) if block_given?
-        tag(:input, html_options.merge({ 
-          :type => "button", :value => name, 

trunk/actionpack/test/template/javascript_helper_test.rb

@@ -32 +32 @@
-  end
-
+  def test_link_to_function_with_rjs_block
+    html = link_to_function( "Greet me!" ) do |page|
+      page.replace_html 'header', "<h1>Greetings</h1>"
+    end
+    assert_dom_equal %(<a href="#" onclick="Element.update(&quot;header&quot;, &quot;&lt;h1&gt;Greetings&lt;/h1&gt;&quot;);; return false;">Greet me!</a>), html
+  end
+
+
-  def test_button_to_function
-    assert_dom_equal %(<input type="button" onclick="alert('Hello world!');" value="Greeting" />), 
-      button_to_function("Greeting", "alert('Hello world!')")
-  end
+
+  def test_button_to_function_with_rjs_block
+    html = button_to_function( "Greet me!" ) do |page|
+      page.replace_html 'header', "<h1>Greetings</h1>"
+    end
+    assert_dom_equal %(<input type="button" onclick="Element.update(&quot;header&quot;, &quot;&lt;h1&gt;Greetings&lt;/h1&gt;&quot;);;" value="Greet me!" />), html
+  end
-end