Permalink
Browse files

Updated vendor copy of html-scanner to support better xml parsing

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2131 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 873be12 commit bfdb4375089cb16abd0a44e1a98194666986f491 @jamis jamis committed Sep 5, 2005
View
@@ -1,5 +1,7 @@
*SVN*
+* Updated vendor copy of html-scanner to support better xml parsing
+
* Added :popup option to UrlHelper#link_to #1996 [gabriel.gironda@gmail.com]. Examples:
link_to "Help", { :action => "help" }, :popup => true
@@ -11,7 +11,7 @@ class Document #:nodoc:
attr_reader :root
# Create a new Document from the given text.
- def initialize(text, strict=false)
+ def initialize(text, strict=false, xml=false)
tokenizer = Tokenizer.new(text)
@root = Node.new(nil)
node_stack = [ @root ]
@@ -38,7 +38,7 @@ def initialize(text, strict=false)
EOF
strict ? raise(msg) : warn(msg)
end
- elsif !node.childless? && node.closing != :close
+ elsif !node.childless?(xml) && node.closing != :close
node_stack.push node
end
end
@@ -271,7 +271,8 @@ def [](attr)
end
# Returns non-+nil+ if this tag can contain child nodes.
- def childless?
+ def childless?(xml = false)
+ return false if xml && @closing.nil?
!@closing.nil? ||
@name =~ /^(img|br|hr|link|meta|area|base|basefont|
col|frame|input|isindex|param)$/ox

0 comments on commit bfdb437

Please sign in to comment.