deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use XHTMLSerializer, where appropriate.

Browse source
This commit is contained in:
Jacques Distler 2007-07-04 18:53:03 -05:00
parent 8ccaad85a5
commit 1bc5da0053
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/sanitize.rb
View file

@ -99,12 +99,8 @@ module Sanitize
# #
def sanitize_rexml(tree) def sanitize_rexml(tree)
tokens = TreeWalkers.getTreeWalker('rexml').new(tree.to_ncr) tokens = TreeWalkers.getTreeWalker('rexml').new(tree.to_ncr)
HTMLSerializer.serialize(tokens, {:encoding=>'utf-8', XHTMLSerializer.serialize(tokens, {:encoding=>'utf-8',
:quote_attr_values => true,
:minimize_boolean_attributes => false,
:use_trailing_solidus => true,
:space_before_trailing_solidus => true, :space_before_trailing_solidus => true,
:omit_optional_tags => false,
:inject_meta_charset => false, :inject_meta_charset => false,
:sanitize => true}) :sanitize => true})
end end

6
vendor/plugins/HTML5lib/tests/test_sanitizer.rb vendored
View file

@ -23,12 +23,8 @@ class SanitizeTest < Test::Unit::TestCase
require 'rexml/document' require 'rexml/document'
doc = REXML::Document.new("<div xmlns='http://www.w3.org/1999/xhtml'>#{stream}</div>") doc = REXML::Document.new("<div xmlns='http://www.w3.org/1999/xhtml'>#{stream}</div>")
tokens = TreeWalkers.getTreeWalker('rexml').new(doc) tokens = TreeWalkers.getTreeWalker('rexml').new(doc)
HTMLSerializer.serialize(tokens, {:encoding=>'utf-8', XHTMLSerializer.serialize(tokens, {:encoding=>'utf-8',
:quote_attr_values => true,
:quote_char => "'", :quote_char => "'",
:minimize_boolean_attributes => false,
:use_trailing_solidus => true,
:omit_optional_tags => false,
:inject_meta_charset => false, :inject_meta_charset => false,
:sanitize => true}).gsub(/\A<div xmlns='http:\/\/www.w3.org\/1999\/xhtml'>(.*)<\/div>\Z/m, '\1') :sanitize => true}).gsub(/\A<div xmlns='http:\/\/www.w3.org\/1999\/xhtml'>(.*)<\/div>\Z/m, '\1')
rescue REXML::ParseException rescue REXML::ParseException