domhandler - npm Package Compare versions

Comparing version 1.3.0 to 1.3.1

lib/handler.js

@@ -48,10 +48,23 @@ var ElementType = require("./ElementType.js"),
 
-
-	if(!lastTag){ //There aren't parent elements
+	if(lastTag){
+		lastTag.children.push(element);
+	} else { //There aren't parent elements
 		this.dom.push(element);
-		return;
 	}
+};
 
-	if(DomUtils.isTag(element)){
-		element.parent = lastTag;
+DomHandler.prototype.onopentag = function(name, attribs){
+	var lastTag = this._tagStack[this._tagStack.length - 1];
+
+	var element = {
+		type: name === "script" ? ElementType.Script : name === "style" ? ElementType.Style : ElementType.Tag,
+		name: name,
+		attribs: attribs,
+		children: [],
+		prev: null,
+		next: null,
+		parent: lastTag || null
+	};
+
+	if(lastTag){
 		var idx = lastTag.children.length;
@@ -65,18 +78,7 @@ while(idx > 0){
 		}
+		lastTag.children.push(element);
+	} else {
+		this.dom.push(element);
 	}
 
-	lastTag.children.push(element);
-};
-
-DomHandler.prototype.onopentag = function(name, attribs){
-	var element = {
-		type: name === "script" ? ElementType.Script : name === "style" ? ElementType.Style : ElementType.Tag,
-		name: name,
-		attribs: attribs,
-		children: [],
-		prev: null,
-		next: null,
-		parent: null
-	};
-	this._addDomElement(element);
 	this._tagStack.push(element);
@@ -92,4 +94,3 @@ };
 		(lastTag = this._tagStack[this._tagStack.length - 1]) &&
-		(lastTag = lastTag.children) &&
-		(lastTag = lastTag[lastTag.length - 1]) &&
+		(lastTag = lastTag.children[lastTag.children.length - 1]) &&
 		lastTag.type === ElementType.Text
@@ -96,0 +97,0 @@ ){

package.json

 {
   "name": "domhandler",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "htmlparser2's dom as a separate module",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

tests/DOM/02-single_tag_1.json

@@ -12,4 +12,3 @@ {
       "name": "br",
-      "attribs": {},
-      "children": null
+      "attribs": {}
     },
@@ -23,6 +22,5 @@ {
       "name": "br",
-      "attribs": {},
-      "children": null
+      "attribs": {}
     }
   ]
 }

tests/DOM/03-single_tag_2.json

@@ -12,4 +12,3 @@ {
       "name": "br",
-      "attribs": {},
-      "children": null
+      "attribs": {}
     },
@@ -23,6 +22,5 @@ {
       "name": "br",
-      "attribs": {},
-      "children": null
+      "attribs": {}
     }
   ]
 }

tests/DOM/10-singular_attribute.json

@@ -15,6 +15,5 @@ {
         "selected": ""
-      },
-      "children": null
+      }
     }
   ]
 }

tests/DOM/11-text_outside_tags.json

@@ -16,4 +16,3 @@ {
       "name": "br",
-      "attribs": {},
-      "children": null
+      "attribs": {}
     },
@@ -20,0 +19,0 @@ {

tests/DOM/16-ignore_whitespace.json

@@ -18,4 +18,3 @@ {
       "name": "br",
-      "attribs": {},
-      "children": null
+      "attribs": {}
     },
@@ -25,4 +24,3 @@ {
       "name": "br",
-      "attribs": {},
-      "children": null
+      "attribs": {}
     },
@@ -41,4 +39,3 @@ {
           "name": "br",
-          "attribs": {},
-          "children": null
+          "attribs": {}
         },
@@ -45,0 +42,0 @@ {

tests/DOM/18-enforce_empty_tags.json

@@ -12,4 +12,3 @@ {
       "name": "link",
-      "attribs": {},
-      "children": null
+      "attribs": {}
     },
@@ -16,0 +15,0 @@ {

No alert changes

Worsened metrics

Total package byte prevSize

25472

decreased by-0.76%

Lines of code

975

decreased by-0.91%

No dependency changes