diff options
| author | Ascrod <32915892+Ascrod@users.noreply.github.com> | 2020-05-23 22:12:01 -0400 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-06-01 11:46:41 +0000 |
| commit | 66470fa1d8df6e3b145e060aba0e7b2649a55129 (patch) | |
| tree | 5432b8adda5e4f3c7147ebe83170541e709cdebb /toolkit/components/reader/Readability-readerable.js | |
| parent | 3045e1d5c9805221ab9a28539286ba463f636210 (diff) | |
| download | UXP-66470fa1d8df6e3b145e060aba0e7b2649a55129.tar UXP-66470fa1d8df6e3b145e060aba0e7b2649a55129.tar.gz UXP-66470fa1d8df6e3b145e060aba0e7b2649a55129.tar.lz UXP-66470fa1d8df6e3b145e060aba0e7b2649a55129.tar.xz UXP-66470fa1d8df6e3b145e060aba0e7b2649a55129.zip | |
Issue #361 - Update Readability from upstream.
(git rev 52ab9b5c8916c306a47b2119270dcdabebf9d203)
Diffstat (limited to 'toolkit/components/reader/Readability-readerable.js')
| -rw-r--r-- | toolkit/components/reader/Readability-readerable.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/toolkit/components/reader/Readability-readerable.js b/toolkit/components/reader/Readability-readerable.js index d0e1b8164..839d9fbf7 100644 --- a/toolkit/components/reader/Readability-readerable.js +++ b/toolkit/components/reader/Readability-readerable.js @@ -31,13 +31,16 @@ var REGEXPS = { // NOTE: These two regular expressions are duplicated in // Readability.js. Please keep both copies in sync. - unlikelyCandidates: /-ad-|banner|breadcrumbs|combx|comment|community|cover-wrap|disqus|extra|foot|header|legends|menu|related|remark|replies|rss|shoutbox|sidebar|skyscraper|social|sponsor|supplemental|ad-break|agegate|pagination|pager|popup|yom-remote/i, - okMaybeItsACandidate: /and|article|body|column|main|shadow/i, + unlikelyCandidates: /-ad-|ai2html|banner|breadcrumbs|combx|comment|community|cover-wrap|disqus|extra|footer|gdpr|header|legends|menu|related|remark|replies|rss|shoutbox|sidebar|skyscraper|social|sponsor|supplemental|ad-break|agegate|pagination|pager|popup|yom-remote/i, + okMaybeItsACandidate: /and|article|body|column|content|main|shadow/i, }; function isNodeVisible(node) { - // Have to null-check node.style to deal with SVG and MathML nodes. - return (!node.style || node.style.display != "none") && !node.hasAttribute("hidden"); + // Have to null-check node.style and node.className.indexOf to deal with SVG and MathML nodes. + return (!node.style || node.style.display != "none") + && !node.hasAttribute("hidden") + //check for "fallback-image" so that wikimedia math images are displayed + && (!node.hasAttribute("aria-hidden") || node.getAttribute("aria-hidden") != "true" || (node.className && node.className.indexOf && node.className.indexOf("fallback-image") !== -1)); } /** |