Merge pull request #74 from patrick-steele-idem/master

Fix existing and add new options
fb55 · Feb 14, 2014 · 4497ee4 · 4497ee4
2 parents 7f3aa5b + 54f33ad
commit 4497ee4
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/lib/Parser.js b/lib/Parser.js
@@ -97,7 +97,10 @@ function Parser(cbs, options){
 	this.startIndex = 0;
 	this.endIndex = null;
 
-	this._tokenizer = new Tokenizer(options, this);
+	this._lowerCaseTagNames = "lowerCaseTags" in this._options ? !!this._options.lowerCaseTags : !this._options.xmlMode;
+	this._lowerCaseAttributeNames = "lowerCaseAttributeNames" in this._options ? !!this._options.lowerCaseAttributeNames : !this._options.xmlMode;
+
+	this._tokenizer = new Tokenizer(this._options, this);
 }
 
 require("util").inherits(Parser, require("events").EventEmitter);
@@ -119,7 +122,7 @@ Parser.prototype.ontext = function(data){
 };
 
 Parser.prototype.onopentagname = function(name){
-	if(!(this._options.xmlMode || "lowerCaseTags" in this._options) || this._options.lowerCaseTags){
+	if(this._lowerCaseTagNames){
 		name = name.toLowerCase();
 	}
 
@@ -159,7 +162,7 @@ Parser.prototype.onopentagend = function(){
 Parser.prototype.onclosetag = function(name){
 	this._updatePosition(1);
 
-	if(!(this._options.xmlMode || "lowerCaseTags" in this._options) || this._options.lowerCaseTags){
+	if(this._lowerCaseTagNames){
 		name = name.toLowerCase();
 	}
 
@@ -182,7 +185,7 @@ Parser.prototype.onclosetag = function(name){
 };
 
 Parser.prototype.onselfclosingtag = function(){
-	if(this._options.xmlMode){
+	if(this._options.xmlMode || this._options.recognizeSelfClosing){
 		this._closeCurrentTag();
 	} else {
 		this.onopentagend();
@@ -205,7 +208,7 @@ Parser.prototype._closeCurrentTag = function(){
 };
 
 Parser.prototype.onattribname = function(name){
-	if(!(this._options.xmlMode || "lowerCaseAttributeNames" in this._options) || this._options.lowerCaseAttributeNames){
+	if(this._lowerCaseAttributeNames){
 		name = name.toLowerCase();
 	}
 	this._attribname = name;
@@ -232,7 +235,7 @@ Parser.prototype.ondeclaration = function(value){
 		var idx = value.search(re_nameEnd),
 		    name = idx < 0 ? value : value.substr(0, idx);
 
-		if(!(this._options.xmlMode || "lowerCaseTags" in this._options) || this._options.lowerCaseTags){
+		if(this._lowerCaseTagNames){
 			name = name.toLowerCase();
 		}
 		this._cbs.onprocessinginstruction("!" + name, "!" + value);
@@ -244,7 +247,7 @@ Parser.prototype.onprocessinginstruction = function(value){
 		var idx = value.search(re_nameEnd),
 		    name = idx < 0 ? value : value.substr(0, idx);
 
-		if(!(this._options.xmlMode || "lowerCaseTags" in this._options) || this._options.lowerCaseTags){
+		if(this._lowerCaseTagNames){
 			name = name.toLowerCase();
 		}
 		this._cbs.onprocessinginstruction("?" + name, "?" + value);
@@ -261,7 +264,7 @@ Parser.prototype.oncomment = function(value){
 Parser.prototype.oncdata = function(value){
 	this._updatePosition(1);
 
-	if(this._options.xmlMode){
+	if(this._options.xmlMode || this._options.recognizeCDATA){
 		if(this._cbs.oncdatastart) this._cbs.oncdatastart();
 		if(this._cbs.ontext) this._cbs.ontext(value);
 		if(this._cbs.oncdataend) this._cbs.oncdataend();