Skip to content

Simplify a bit the ontext handler. #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jails wants to merge 1 commit into from
Closed

Simplify a bit the ontext handler. #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 13 additions & 30 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
var ElementType = require("domelementtype");

var re_whitespace = /\s+/g;
var NodePrototype = require("./lib/node");
var ElementPrototype = require("./lib/element");

var re_whitespace = /\s+/g;

function DomHandler(callback, options, elementCB){
if(typeof callback === "object"){
elementCB = options;
Expand Down Expand Up @@ -42,6 +42,7 @@ DomHandler.prototype.onend = function(){
if(this._done) return;
this._done = true;
this._parser = null;
this._activeTextNode = null;
this._handleCallback(null);
};

Expand All @@ -55,7 +56,7 @@ DomHandler.prototype.onerror = function(error){
};

DomHandler.prototype.onclosetag = function(){
//if(this._tagStack.pop().name !== name) this._handleCallback(Error("Tagname didn't match!"));
this._activeTextNode = null;
var elem = this._tagStack.pop();
if(this._elementCB) this._elementCB(elem);
};
Expand Down Expand Up @@ -84,6 +85,7 @@ DomHandler.prototype._addDomElement = function(element){

siblings.push(element);
element.parent = parent || null;
this._activeTextNode = element.type === ElementType.Text ? element : null;
};

DomHandler.prototype.onopentag = function(name, attribs){
Expand All @@ -104,36 +106,17 @@ DomHandler.prototype.ontext = function(data){
//it's an alias for normalizeWhitespace
var normalize = this._options.normalizeWhitespace || this._options.ignoreWhitespace;

var lastTag;

if(!this._tagStack.length && this.dom.length && (lastTag = this.dom[this.dom.length-1]).type === ElementType.Text){
if(normalize){
lastTag.data = (lastTag.data + data).replace(re_whitespace, " ");
if (this._activeTextNode) {
if (normalize) {
this._activeTextNode.data = (this._activeTextNode.data + data).replace(re_whitespace, " ");
} else {
lastTag.data += data;
this._activeTextNode.data += data;
}
} else {
if(
this._tagStack.length &&
(lastTag = this._tagStack[this._tagStack.length - 1]) &&
(lastTag = lastTag.children[lastTag.children.length - 1]) &&
lastTag.type === ElementType.Text
){
if(normalize){
lastTag.data = (lastTag.data + data).replace(re_whitespace, " ");
} else {
lastTag.data += data;
}
} else {
if(normalize){
data = data.replace(re_whitespace, " ");
}

this._addDomElement({
data: data,
type: ElementType.Text
});
}
this._addDomElement({
data: normalize ? data.replace(re_whitespace, " ") : data,
type: ElementType.Text
});
}
};

Expand Down
1 change: 1 addition & 0 deletions test/cases/24-with-start-indices.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"type": "directive"
},
{
"startIndex": 14,
"type": "text",
"data": " "
},
Expand Down