Permalink
Browse files

Added block-acceptance to JavaScriptHelper#javascript_tag (closes #7527

…) [BobSilva/tarmo/rmm5t]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7485 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 79202b3 commit 0b0931e15066a04bb5aea8dac910497ddb5f9b33 @dhh dhh committed Sep 15, 2007
@@ -156,17 +156,36 @@ def escape_javascript(javascript)
# javascript_tag "alert('All is good')"
#
# Returns:
- #
# <script type="text/javascript">
# //<![CDATA[
# alert('All is good')
# //]]>
# </script>
#
# +html_options+ may be a hash of attributes for the <script> tag. Example:
- # javascript_tag "alert('All is good')", :defer => 'true' # => <script defer="true" type="text/javascript">alert('All is good')</script>
- def javascript_tag(content, html_options = {})
- content_tag("script", javascript_cdata_section(content), html_options.merge(:type => Mime::JS))
+ # javascript_tag "alert('All is good')", :defer => 'defer'
+ # # => <script defer="defer" type="text/javascript">alert('All is good')</script>
+ #
+ # Instead of passing the content as an argument, you can also use a block
+ # in which case, you pass your +html_options+ as the first parameter.
+ # <% javascript_tag :defer => 'defer' do -%>
+ # alert('All is good')
+ # <% end -%>
+ def javascript_tag(content_or_options_with_block = nil, html_options = {}, &block)
+ if block_given?
+ html_options = content_or_options_with_block if content_or_options_with_block.is_a?(Hash)
+ content = capture(&block)
+ else
+ content = content_or_options_with_block
+ end
+
+ javascript_tag = content_tag("script", javascript_cdata_section(content), html_options.merge(:type => Mime::JS))
+
+ if block_given? && block_is_within_action_view?(block)
+ concat(javascript_tag, block.binding)
+ else
+ javascript_tag
+ end
end
def javascript_cdata_section(content) #:nodoc:
@@ -186,6 +205,11 @@ def array_or_string_for_javascript(option)
end
js_option
end
+
+ private
+ def block_is_within_action_view?(block)
+ eval("defined? _erbout", block.binding)
+ end
end
JavascriptHelper = JavaScriptHelper unless const_defined? :JavascriptHelper
@@ -91,6 +91,18 @@ def test_javascript_tag_with_options
javascript_tag("alert('hello')", :id => "the_js_tag")
end
+ def test_javascript_tag_with_block
+ _erbout = ''
+ javascript_tag { _erbout.concat "alert('hello')" }
+ assert_dom_equal "<script type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>", _erbout
+ end
+
+ def test_javascript_tag_with_block_and_options
+ _erbout = ''
+ javascript_tag(:id => "the_js_tag") { _erbout.concat "alert('hello')" }
+ assert_dom_equal "<script id=\"the_js_tag\" type=\"text/javascript\">\n//<![CDATA[\nalert('hello')\n//]]>\n</script>", _erbout
+ end
+
def test_javascript_cdata_section
assert_dom_equal "\n//<![CDATA[\nalert('hello')\n//]]>\n", javascript_cdata_section("alert('hello')")
end
View
@@ -1,5 +1,7 @@
*SVN*
+* Added block-acceptance to JavaScriptHelper#javascript_tag #7527 [BobSilva/tarmo/rmm5t]
+
* Fixed that altering join tables in migrations would fail w/ sqlite3 #7453 [TimoMihaljov/brandon]
* Fix association writer with :dependent => :nullify. #7314 [Jonathan Viney]

0 comments on commit 0b0931e

Please sign in to comment.