Fixes discussed in https://github.com/fb55/node-htmlparser/pull/28

Author: Kris Reeves

lib/Parser.js

@@ -67,22 +67,30 @@ var defaultCbs = {
 	*/
 };
 
-var formTags = {'input':1, 'option':1, 'optgroup':1, 'select':1, 'button':1, 'datalist':1, 'textarea':1};
+var formTags = {
+	input: true,
+	option: true,
+	optgroup: true,
+	select: true,
+	button: true,
+	datalist: true,
+	textarea: true
+};
 var openImpliesClose = {
-	'tr'      : {'tr':1, 'th':1, 'td':1},
-	'th'      : {'th':1},
-	'td'      : {'thead':1, 'td':1},
-	'body'    : {'head':1, 'link':1, 'script':1},
-	'li'      : {'li':1},
-	'p'       : {'p':1},
-	'select'  : formTags,
-	'input'   : formTags,
-	'output'  : formTags,
-	'button'  : formTags,
-	'datalist': formTags,
-	'textarea': formTags,
-	'option'  : {'option':1},
-	'optgroup': {'optgroup':1}
+	tr      : { tr:true, th:true, td:true },
+	th      : { th:true },
+	td      : { thead:true, td:true },
+	body    : { head:true, link:true, script:true },
+	li      : { li:true },
+	p       : { p:true },
+	select  : formTags,
+	input   : formTags,
+	output  : formTags,
+	button  : formTags,
+	datalist: formTags,
+	textarea: formTags,
+	option  : { option:true },
+	optgroup: { optgroup:true }
 };
 
 //Parses a complete HTML and pushes it to the handler
@@ -350,7 +358,7 @@ Parser.prototype._processOpenTag = function(data){
 	if(this._options.xmlMode){ /*do nothing*/ }
 	else if(name === "script") type = ElementType.Script;
 	else if(name === "style")  type = ElementType.Style;
-	if (name in openImpliesClose) {
+	if (!this._options.xmlMode && name in openImpliesClose) {
 		var el;
 		while ((el = this._stack[this._stack.length-1]) in openImpliesClose[name]) {
 			this._processCloseTag(el);
@@ -369,7 +377,7 @@ Parser.prototype._processOpenTag = function(data){
 	 * Invalid HTML self-closing tag syntax is ignored (treated as an opening tag).
 	 * Foreign elements use XML rules
 	 */
-	if(!Object.keys(attributes).length && data.substr(-1) === "/" || (name in emptyTags && !this._options.xmlMode)){
+	if((!this._options.xmlMode && name in emptyTags) || (data.substr(-1) === "/" && data.replace(_reAttrib, "").substr(-1) === "/")){
 		if(this._cbs.onclosetag) this._cbs.onclosetag(name);
 	} else {
 		if(type !== ElementType.Tag){
@@ -386,4 +394,4 @@ Parser.prototype._handleError = function(error){
 	else throw error;
 };
 
-module.exports = Parser;
+module.exports = Parser;