- Added isClosed attribute to the Element class

pborissow · pborissow · commit 0aed83b17e74 · 2022-11-04T14:06:35.000Z
- Fixed bug in the HTML Parser to deal with comments that end with "&gt;--&gt;"

git-svn-id: svn://192.168.0.80/JavaXT/javaxt-core@1442 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff
diff --git a/src/javaxt/html/Element.java b/src/javaxt/html/Element.java
@@ -16,6 +16,7 @@ public class Element {
     private String innerHTML;
     private String outerHTML;
     private Parser parser;
+    private boolean isClosed;
 
 
   //**************************************************************************
@@ -70,9 +71,22 @@ public Element(String outerHTML) throws Exception {
 
       //Set innerHTML
         innerHTML = outerHTML.substring(gt);
-        if (innerHTML.trim().length()>0){
+        if (innerHTML.trim().length()>0){ //has inner html
+
             int idx = innerHTML.lastIndexOf("</" + nodeName);
-            if (idx>-1) innerHTML = innerHTML.substring(0, idx);
+            if (idx>-1){
+                innerHTML = innerHTML.substring(0, idx);
+                isClosed = true;
+            }
+            else{
+                isClosed = false;
+            }
+        }
+        else{ //no inner html
+
+          //Check if the tag is self enclosing (e.g. "<hr/>")
+            char c = outerHTML.charAt(gt-2); //character immediately before ">"
+            isClosed = c=='/';
         }
     }
 
@@ -98,6 +112,16 @@ public String getAttributes(){
     }
 
 
+  //**************************************************************************
+  //** isClosed
+  //**************************************************************************
+  /** Returns true if the element has a closing tag or is self closing
+   */
+    public boolean isClosed(){
+        return isClosed;
+    }
+
+
   //**************************************************************************
   //** getInnerHTML
   //**************************************************************************
diff --git a/src/javaxt/html/Parser.java b/src/javaxt/html/Parser.java
@@ -1,5 +1,6 @@
 package javaxt.html;
 import java.util.ArrayList;
+import static javaxt.utils.Console.console;
 
 //******************************************************************************
 //**  HTML Parser
@@ -467,9 +468,9 @@ private static int findEndTag(String tagName, int x, String s){
         int len = s.length();
         for (int i=x; i<len; i++){
             char c = s.charAt(i);
+            char p = s.charAt(i-1);
 
-
-            if (isBlank(c) || i==len-1 || (c=='<' && s.charAt(i-1)=='>')){
+            if (isBlank(c) || i==len-1 || (c=='<' && p=='>') || (c=='-' && p=='>')){
 
                 if (start>-1){
                     String str = s.substring(start, i);
@@ -546,12 +547,20 @@ else if (tag.equals(tagName)){
                                         numTags++;
                                     }
                                 }
+                                else{
+
+
+                                    //Hacky solution for comments that end with ">-->"
+                                      if (tagName.equals("--") && tag.equals("-")){
+                                        foundMatch = true;
+                                        numTags--;
+                                      }
+                                }
 
                             }
                         }
 
 
-
 //                        console.log("tag2:", tag, numTags, foundMatch);
 
 
