- Fixed bug parsing self enclosing tags.

pborissow · pborissow · commit cd4bb9e3f377 · 2014-12-22T23:29:29.000Z
git-svn-id: svn://192.168.0.80/JavaXT/javaxt-core@666 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff
diff --git a/src/javaxt/html/Element.java b/src/javaxt/html/Element.java
@@ -45,6 +45,8 @@ protected Element(String html){
         tag = tag.replace("/>","");
         tag = tag.replace(">","");
         //tag = AddQuotes(tag);
+
+        tag = tag.replaceAll("\\s+"," ").trim();
         tag = tag.trim();
 
         arr = tag.split(" ");
diff --git a/src/javaxt/html/Parser.java b/src/javaxt/html/Parser.java
@@ -268,13 +268,17 @@ public Element getElementByAttributes(String tagName, String attributeName, Stri
 
 
                               //Special case for tags that self terminate
-                                if (Tag.isEndTag())  return Element;
+                                if (Tag.isEndTag()){
+                                    //Element.innerHTML = null;
+                                    Element.outerHTML = tag.toString();
+                                    return Element;
+                                }
                                 
                             }
                         }
                     }
                 }
-                else { 
+                else {
 
                     if (Tag.getName().equalsIgnoreCase(tagName)){
 

Original file line number	Diff line number	Diff line change
`@@ -268,13 +268,17 @@ public Element getElementByAttributes(String tagName, String attributeName, Stri`
`268`	`268`
`269`	`269`
`270`	`270`	`//Special case for tags that self terminate`
`271`		`- if (Tag.isEndTag()) return Element;`
	`271`	`+ if (Tag.isEndTag()){`
	`272`	`+ //Element.innerHTML = null;`
	`273`	`+ Element.outerHTML = tag.toString();`
	`274`	`+ return Element;`
	`275`	`+ }`
`272`	`276`
`273`	`277`	`}`
`274`	`278`	`}`
`275`	`279`	`}`
`276`	`280`	`}`
`277`		`- else {`
	`281`	`+ else {`
`278`	`282`
`279`	`283`	`if (Tag.getName().equalsIgnoreCase(tagName)){`
`280`	`284`