mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
No bug - update readability from github repo, includes fix for bug 1230050, rs=uplift-with-r+-patches-from-github
This commit is contained in:
parent
63b93c5c89
commit
8b153dd066
@ -33,10 +33,6 @@
|
||||
*/
|
||||
(function (global) {
|
||||
|
||||
function error(m) {
|
||||
dump("JSDOMParser error: " + m + "\n");
|
||||
}
|
||||
|
||||
// XML only defines these and the numeric ones:
|
||||
|
||||
var entityTable = {
|
||||
@ -676,9 +672,9 @@
|
||||
arr.push(" " + attr.name + '=' + quote + val + quote);
|
||||
}
|
||||
|
||||
if (child.localName in voidElems) {
|
||||
if (child.localName in voidElems && !child.childNodes.length) {
|
||||
// if this is a self-closing element, end it here
|
||||
arr.push(">");
|
||||
arr.push("/>");
|
||||
} else {
|
||||
// otherwise, add its children
|
||||
arr.push(">");
|
||||
@ -849,9 +845,16 @@
|
||||
// makeElementNode(), which saves us from having to allocate a new array
|
||||
// every time.
|
||||
this.retPair = [];
|
||||
|
||||
this.errorState = "";
|
||||
};
|
||||
|
||||
JSDOMParser.prototype = {
|
||||
error: function(m) {
|
||||
dump("JSDOMParser error: " + m + "\n");
|
||||
this.errorState += m + "\n";
|
||||
},
|
||||
|
||||
/**
|
||||
* Look at the next character without advancing the index.
|
||||
*/
|
||||
@ -906,7 +909,7 @@
|
||||
// After a '=', we should see a '"' for the attribute value
|
||||
var c = this.nextChar();
|
||||
if (c !== '"' && c !== "'") {
|
||||
error("Error reading attribute " + name + ", expecting '\"'");
|
||||
this.error("Error reading attribute " + name + ", expecting '\"'");
|
||||
return;
|
||||
}
|
||||
|
||||
@ -959,12 +962,12 @@
|
||||
}
|
||||
|
||||
// If this is a self-closing tag, read '/>'
|
||||
var closed = tag in voidElems;
|
||||
var closed = false;
|
||||
if (c === "/") {
|
||||
closed = true;
|
||||
c = this.nextChar();
|
||||
if (c !== ">") {
|
||||
error("expected '>' to close " + tag);
|
||||
this.error("expected '>' to close " + tag);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@ -1134,7 +1137,7 @@
|
||||
}
|
||||
var closingTag = "</" + localName + ">";
|
||||
if (!this.match(closingTag)) {
|
||||
error("expected '" + closingTag + "'");
|
||||
this.error("expected '" + closingTag + "' and got " + this.html.substr(this.currentChar, closingTag.length));
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
@ -117,7 +117,7 @@ Readability.prototype = {
|
||||
unlikelyCandidates: /banner|combx|comment|community|disqus|extra|foot|header|menu|related|remark|rss|share|shoutbox|sidebar|skyscraper|sponsor|ad-break|agegate|pagination|pager|popup/i,
|
||||
okMaybeItsACandidate: /and|article|body|column|main|shadow/i,
|
||||
positive: /article|body|content|entry|hentry|main|page|pagination|post|text|blog|story/i,
|
||||
negative: /hidden|banner|combx|comment|com-|contact|foot|footer|footnote|masthead|media|meta|outbrain|promo|related|scroll|share|shoutbox|sidebar|skyscraper|sponsor|shopping|tags|tool|widget/i,
|
||||
negative: /hidden|^hid$| hid$| hid |^hid |banner|combx|comment|com-|contact|foot|footer|footnote|masthead|media|meta|outbrain|promo|related|scroll|share|shoutbox|sidebar|skyscraper|sponsor|shopping|tags|tool|widget/i,
|
||||
extraneous: /print|archive|comment|discuss|e[\-]?mail|share|reply|all|login|sign|single|utility/i,
|
||||
byline: /byline|author|dateline|writtenby/i,
|
||||
replaceFonts: /<(\/?)font[^>]*>/gi,
|
||||
|
Loading…
Reference in New Issue
Block a user