Permalink
Browse files

Use Element.update('id', 'html') instead of uid=501(sam) gid=501(sam)…

… groups=501(sam), 81(appserveradm), 79(appserverusr), 80(admin).innerHTML = 'html' in JavaScriptGenerator#replace_html so that script tags are evaluated

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3086 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 62fe5bb commit b3c65bc8490b072a0d314aa3858c680fc6d67e35 @sstephenson sstephenson committed Nov 18, 2005
View
@@ -1,5 +1,7 @@
*SVN*
+* Use Element.update('id', 'html') instead of $('id').innerHTML = 'html' in JavaScriptGenerator#replace_html so that script tags are evaluated. [Sam Stephenson]
+
* Make rjs templates always implicitly skip out on layouts. [Marcel Molina Jr.]
* Correct length for the truncate text helper. #2913 [Stefan Kaes]
@@ -425,7 +425,7 @@ def insert_html(position, id, *options_for_render)
#
def replace_html(id, *options_for_render)
html = render(*options_for_render)
- record "$(#{id.inspect}).innerHTML = #{html.inspect}"
+ record "Element.update(#{id.inspect}, #{html.inspect})"
end
# Removes the DOM elements with the given +ids+ from the page.
@@ -167,7 +167,7 @@ def test_insert_html_with_string
end
def test_replace_html_with_string
- assert_equal '$("element").innerHTML = "<p>This is a test</p>";',
+ assert_equal 'Element.update("element", "<p>This is a test</p>");',
@generator.replace_html('element', '<p>This is a test</p>')
end
@@ -202,7 +202,7 @@ def test_to_s
new Insertion.Top("element", "<p>This is a test</p>");
new Insertion.Bottom("element", "<p>This is a test</p>");
["foo", "bar"].each(Element.remove);
-$("baz").innerHTML = "<p>This is a test</p>";
+Element.update("baz", "<p>This is a test</p>");
EOS
end
end

0 comments on commit b3c65bc

Please sign in to comment.