htmlparser2
Advanced tools
Comparing version 3.7.3 to 3.8.0
@@ -31,7 +31,7 @@ var index = require("./index.js"), | ||
var isValidFeed = function(value) { | ||
var isValidFeed = function(value){ | ||
return value === "rss" || value === "feed" || value === "rdf:RDF"; | ||
}; | ||
FeedHandler.prototype.onend = function() { | ||
FeedHandler.prototype.onend = function(){ | ||
var feed = {}, | ||
@@ -38,0 +38,0 @@ feedRoot = getOneElement(isValidFeed, this.dom), |
@@ -39,3 +39,3 @@ var Parser = require("./Parser.js"), | ||
//helper methods | ||
parseDOM: function(data, options) { | ||
parseDOM: function(data, options){ | ||
var handler = new DomHandler(options); | ||
@@ -42,0 +42,0 @@ new Parser(handler, options).end(data); |
@@ -43,2 +43,8 @@ var Tokenizer = require("./Tokenizer.js"); | ||
p : { p:true }, | ||
h1 : { p:true }, | ||
h2 : { p:true }, | ||
h3 : { p:true }, | ||
h4 : { p:true }, | ||
h5 : { p:true }, | ||
h6 : { p:true }, | ||
select : formTags, | ||
@@ -82,3 +88,6 @@ input : formTags, | ||
rect: true, | ||
use: true | ||
use: true, | ||
stop: true, | ||
polyline: true, | ||
polygone: true | ||
}; | ||
@@ -109,2 +118,4 @@ | ||
this._tokenizer = new Tokenizer(this._options, this); | ||
if(this._cbs.onparserinit) this._cbs.onparserinit(this); | ||
} | ||
@@ -141,6 +152,6 @@ | ||
if (!this._options.xmlMode && name in openImpliesClose) { | ||
if(!this._options.xmlMode && name in openImpliesClose) { | ||
for( | ||
var el; | ||
(el = this._stack[this._stack.length-1]) in openImpliesClose[name]; | ||
(el = this._stack[this._stack.length - 1]) in openImpliesClose[name]; | ||
this.onclosetag(el) | ||
@@ -213,3 +224,3 @@ ); | ||
//(cheaper check than in onclosetag) | ||
if(this._stack[this._stack.length-1] === name){ | ||
if(this._stack[this._stack.length - 1] === name){ | ||
if(this._cbs.onclosetag){ | ||
@@ -216,0 +227,0 @@ this._cbs.onclosetag(name); |
@@ -411,3 +411,3 @@ module.exports = Tokenizer; | ||
this._sectionStart = this._index + 1; | ||
} else if (c !== "]") { | ||
} else if(c !== "]") { | ||
this._state = IN_CDATA; | ||
@@ -598,3 +598,3 @@ } | ||
Tokenizer.prototype._cleanup = function () { | ||
Tokenizer.prototype._cleanup = function (){ | ||
if(this._sectionStart < 0){ | ||
@@ -601,0 +601,0 @@ this._buffer = ""; |
{ | ||
"name": "htmlparser2", | ||
"description": "Fast & forgiving HTML/XML/RSS parser", | ||
"version": "3.7.3", | ||
"version": "3.8.0", | ||
"author": "Felix Boehm <me@feedic.com>", | ||
@@ -32,3 +32,3 @@ "keywords": [ | ||
"test": "mocha && npm run lint", | ||
"lint": "jshint {lib,test}/*.js test/*/*.js" | ||
"lint": "jshint lib test && jscs lib test" | ||
}, | ||
@@ -47,4 +47,8 @@ "dependencies": { | ||
"istanbul": "*", | ||
"jscs": "1.5.8", | ||
"jshint": "2" | ||
}, | ||
"browser": { | ||
"readable-stream": false | ||
}, | ||
"license": "MIT", | ||
@@ -51,0 +55,0 @@ "jshintConfig": { |
{ | ||
"name": "Implicit close tags", | ||
"options": {}, | ||
"html": "<ol><li class=test><div><table style=width:100%><tr><td colspan=2><h3>Heading</h3><tr><td><div>Div</div><td><div>Div2</div></table></div><li><div><h3>Heading 2</h3></div></li></ol>", | ||
"html": "<ol><li class=test><div><table style=width:100%><tr><td colspan=2><h3>Heading</h3><tr><td><div>Div</div><td><div>Div2</div></table></div><li><div><h3>Heading 2</h3></div></li></ol><p>Para<h4>Heading 4</h4>", | ||
"expected": [ | ||
@@ -57,4 +57,12 @@ { "event": "opentagname", "data": [ "ol" ] }, | ||
{ "event": "closetag", "data": [ "li" ] }, | ||
{ "event": "closetag", "data": [ "ol" ] } | ||
{ "event": "closetag", "data": [ "ol" ] }, | ||
{ "event": "opentagname", "data": [ "p" ] }, | ||
{ "event": "opentag", "data": [ "p", {} ] }, | ||
{ "event": "text", "data": [ "Para" ] }, | ||
{ "event": "closetag", "data": [ "p" ] }, | ||
{ "event": "opentagname", "data": [ "h4" ] }, | ||
{ "event": "opentag", "data": [ "h4", {} ] }, | ||
{ "event": "text", "data": [ "Heading 4" ] }, | ||
{ "event": "closetag", "data": [ "h4" ] } | ||
] | ||
} |
@@ -32,4 +32,4 @@ var htmlparser2 = require(".."), | ||
if(arr[0] === "onerror" || arr[0] === "onend"); | ||
else if(arr[0] === "ontext" && events.length && events[events.length-1].event === "text"){ | ||
events[events.length-1].data[0] += arr[1]; | ||
else if(arr[0] === "ontext" && events.length && events[events.length - 1].event === "text"){ | ||
events[events.length - 1].data[0] += arr[1]; | ||
} else { | ||
@@ -36,0 +36,0 @@ events.push({ |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
140170
63
6273
6