wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 784386 - Part 3: Replace innerHTML call for <br><p> to <p> conversion. r=lucasr

Browse Source
This commit is contained in:
Brian Nicholson 2012-08-31 15:56:13 -07:00
parent af56b71c48
commit 12eef69706
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
mobile/android/chrome/content/Readability.js
View File

@ -82,7 +82,8 @@ Readability.prototype = {
killBreaks: /(<br\s*\/?>(\s|&nbsp;?)*){1,}/g,
videos: /http:\/\/(www\.)?(youtube|vimeo)\.com/i,
nextLink: /(next|weiter|continue|>([^\|]|$)|»([^\|]|$))/i,
prevLink: /(prev|earl|old|new|<|«)/i
prevLink: /(prev|earl|old|new|<|«)/i,
whitespace: /^\s*$/
},
/**
@ -222,6 +223,21 @@ Readability.prototype = {
}
},
/**
* Finds the next element, starting from the given node, and ignoring
* whitespace in between. If the given node is an element, the same node is
* returned.
*/
_nextElement: function (node) {
let next = node;
while (next
&& (next.nodeType != Node.ELEMENT_NODE)
&& this.REGEXPS.whitespace.test(next.textContent)) {
next = next.nextSibling;
}
return next;
},
/**
* Replaces 2 or more successive <br> elements with a single <p>.
* Whitespace between <br> elements are ignored. For example:
@ -230,24 +246,6 @@ Readability.prototype = {
* <div>foo<br>bar<p>abc</p></div>
*/
_replaceBrs: function (elem) {
// ignore whitespace between elements
let whitespace = /^\s*$/;
/**
* Finds the next element, starting from the given node, and ignoring
* whitespace in between. If the given node is an element, the same node is
* returned.
*/
function nextElement(node) {
let next = node;
while (next
&& (next.nodeType != Node.ELEMENT_NODE)
&& whitespace.test(next.textContent)) {
next = next.nextSibling;
}
return next;
}
let brs = elem.getElementsByTagName("br");
for (let i = 0; i < brs.length; i++) {
let br = brs[i];
@ -260,7 +258,7 @@ Readability.prototype = {
// If we find a <br> chain, remove the <br>s until we hit another element
// or non-whitespace. This leaves behind the first <br> in the chain
// (which will be replaced with a <p> later).
while ((next = nextElement(next)) && (next.tagName == "BR")) {
while ((next = this._nextElement(next)) && (next.tagName == "BR")) {
replaced = true;
let sibling = next.nextSibling;
next.parentNode.removeChild(next);
@ -278,7 +276,7 @@ Readability.prototype = {
while (next) {
// If we've hit another <br><br>, we're done adding children to this <p>.
if (next.tagName == "BR") {
let nextElem = nextElement(next);
let nextElem = this._nextElement(next);
if (nextElem && nextElem.tagName == "BR") {
break;
}
@ -343,7 +341,14 @@ Readability.prototype = {
}
}
articleContent.innerHTML = articleContent.innerHTML.replace(/<br[^>]*>\s*<p/gi, '<p');
let brs = articleContent.getElementsByTagName("BR");
for (let i = brs.length; --i >= 0;) {
let br = brs[i];
let next = this._nextElement(br.nextSibling);
if (next && next.tagName == "P") {
br.parentNode.removeChild(br);
}
}
},
/**