Archives
/
readability
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace String.matchAll since it only supported in Node 12+

Browse Source
pull/590/head
Radhi Fadlillah 4 years ago
parent 4fd18f40d1
commit ffdca4b505
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

10
Readability.js
Unescape Escape View File

@ -131,7 +131,7 @@ Readability.prototype = {
prevLink: /(prev|earl|old|new|<|«)/i,
whitespace: /^\s*$/,
hasContent: /\S$/,
srcsetUrl: /(\S+)(\s+[\d.]+[xw])?,?/g,
srcsetUrl: /(\S+)(\s+[\d.]+[xw])?(\s*,\s*)?/g,
},
DIV_TO_P_ELEMS: [ "A", "BLOCKQUOTE", "DL", "DIV", "IMG", "OL", "P", "PRE", "TABLE", "UL", "SELECT" ],
@ -397,11 +397,11 @@ Readability.prototype = {
}
if (srcset) {
var matches = srcset.matchAll(this.REGEXPS.srcsetUrl);
var newSets = Array.from(matches, function(m) {
return toAbsoluteURI(m[1]) + (m[2] || "");
var newSrcset = srcset.replace(this.REGEXPS.srcsetUrl, function(_, p1, p2, p3) {
return toAbsoluteURI(p1) + (p2 || "") + (p3 || "");
});
media.setAttribute("srcset", newSets.join(", "));
media.setAttribute("srcset", newSrcset);
}
});
},

4
test/test-pages/nytimes-3/expected.html
Unescape Escape View File

@ -5,7 +5,7 @@
<div data-testid="photoviewer-wrapper">
<div data-testid="photoviewer-children">
<figure aria-label="media" role="group" itemscope="itemscope" itemprop="associatedMedia" itemid="https://static01.nyt.com/images/2019/02/21/nyregion/21winterutilities1/merlin_150498339_cf9085e5-9756-4169-a5a5-5b516316a3fa-articleLarge.jpg?quality=90&amp;auto=webp" itemtype="http://schema.org/ImageObject">
<p><span>Image</span><img alt="" src="https://static01.nyt.com/images/2019/02/21/nyregion/21winterutilities1/merlin_150498339_cf9085e5-9756-4169-a5a5-5b516316a3fa-articleLarge.jpg?quality=75&amp;auto=webp&amp;disable=upscale" srcset="https://static01.nyt.com/images/2019/02/21/nyregion/21winterutilities1/merlin_150498339_cf9085e5-9756-4169-a5a5-5b516316a3fa-articleLarge.jpg?quality=90&amp;auto=webp 600w, https://static01.nyt.com/images/2019/02/21/nyregion/21winterutilities1/merlin_150498339_cf9085e5-9756-4169-a5a5-5b516316a3fa-jumbo.jpg?quality=90&amp;auto=webp 1024w, https://static01.nyt.com/images/2019/02/21/nyregion/21winterutilities1/merlin_150498339_cf9085e5-9756-4169-a5a5-5b516316a3fa-superJumbo.jpg?quality=90&amp;auto=webp 2048w" sizes="((min-width: 600px) and (max-width: 1004px)) 84vw, (min-width: 1005px) 80vw, 100vw" itemprop="url" itemid="https://static01.nyt.com/images/2019/02/21/nyregion/21winterutilities1/merlin_150498339_cf9085e5-9756-4169-a5a5-5b516316a3fa-articleLarge.jpg?quality=75&amp;auto=webp&amp;disable=upscale" />
<p><span>Image</span><img alt="" src="https://static01.nyt.com/images/2019/02/21/nyregion/21winterutilities1/merlin_150498339_cf9085e5-9756-4169-a5a5-5b516316a3fa-articleLarge.jpg?quality=75&amp;auto=webp&amp;disable=upscale" srcset="https://static01.nyt.com/images/2019/02/21/nyregion/21winterutilities1/merlin_150498339_cf9085e5-9756-4169-a5a5-5b516316a3fa-articleLarge.jpg?quality=90&amp;auto=webp 600w,https://static01.nyt.com/images/2019/02/21/nyregion/21winterutilities1/merlin_150498339_cf9085e5-9756-4169-a5a5-5b516316a3fa-jumbo.jpg?quality=90&amp;auto=webp 1024w,https://static01.nyt.com/images/2019/02/21/nyregion/21winterutilities1/merlin_150498339_cf9085e5-9756-4169-a5a5-5b516316a3fa-superJumbo.jpg?quality=90&amp;auto=webp 2048w" sizes="((min-width: 600px) and (max-width: 1004px)) 84vw, (min-width: 1005px) 80vw, 100vw" itemprop="url" itemid="https://static01.nyt.com/images/2019/02/21/nyregion/21winterutilities1/merlin_150498339_cf9085e5-9756-4169-a5a5-5b516316a3fa-articleLarge.jpg?quality=75&amp;auto=webp&amp;disable=upscale" />
</p>
<figcaption itemprop="caption description">
<span>A Con Edison worker repairing underground cables this month in Flushing, Queens. The likely source of the problem was water and rock salt that had seeped underground.</span><span itemprop="copyrightHolder"><span>Credit</span><span><span>Credit</span><span>Chang W. Lee/The New York Times</span></span></span>
@ -50,7 +50,7 @@
<div data-testid="photoviewer-wrapper">
<div data-testid="photoviewer-children">
<figure aria-label="media" role="group" itemprop="associatedMedia" itemscope="itemscope" itemid="https://static01.nyt.com/images/2019/02/21/nyregion/21winterutilitiesOAK15/merlin_56025490_f9412a36-eeb9-4a10-a41e-f324eb7a3248-articleLarge.jpg?quality=90&amp;auto=webp" itemtype="http://schema.org/ImageObject">
<p><span>Image</span><img alt="" src="https://static01.nyt.com/images/2019/02/21/nyregion/21winterutilitiesOAK15/merlin_56025490_f9412a36-eeb9-4a10-a41e-f324eb7a3248-articleLarge.jpg?quality=75&amp;auto=webp&amp;disable=upscale" srcset="https://static01.nyt.com/images/2019/02/21/nyregion/21winterutilitiesOAK15/merlin_56025490_f9412a36-eeb9-4a10-a41e-f324eb7a3248-articleLarge.jpg?quality=90&amp;auto=webp 600w, https://static01.nyt.com/images/2019/02/21/nyregion/21winterutilitiesOAK15/merlin_56025490_f9412a36-eeb9-4a10-a41e-f324eb7a3248-jumbo.jpg?quality=90&amp;auto=webp 1024w, https://static01.nyt.com/images/2019/02/21/nyregion/21winterutilitiesOAK15/merlin_56025490_f9412a36-eeb9-4a10-a41e-f324eb7a3248-superJumbo.jpg?quality=90&amp;auto=webp 2000w" sizes="((min-width: 600px) and (max-width: 1004px)) 84vw, (min-width: 1005px) 80vw, 100vw" itemprop="url" itemid="https://static01.nyt.com/images/2019/02/21/nyregion/21winterutilitiesOAK15/merlin_56025490_f9412a36-eeb9-4a10-a41e-f324eb7a3248-articleLarge.jpg?quality=75&amp;auto=webp&amp;disable=upscale" />
<p><span>Image</span><img alt="" src="https://static01.nyt.com/images/2019/02/21/nyregion/21winterutilitiesOAK15/merlin_56025490_f9412a36-eeb9-4a10-a41e-f324eb7a3248-articleLarge.jpg?quality=75&amp;auto=webp&amp;disable=upscale" srcset="https://static01.nyt.com/images/2019/02/21/nyregion/21winterutilitiesOAK15/merlin_56025490_f9412a36-eeb9-4a10-a41e-f324eb7a3248-articleLarge.jpg?quality=90&amp;auto=webp 600w,https://static01.nyt.com/images/2019/02/21/nyregion/21winterutilitiesOAK15/merlin_56025490_f9412a36-eeb9-4a10-a41e-f324eb7a3248-jumbo.jpg?quality=90&amp;auto=webp 1024w,https://static01.nyt.com/images/2019/02/21/nyregion/21winterutilitiesOAK15/merlin_56025490_f9412a36-eeb9-4a10-a41e-f324eb7a3248-superJumbo.jpg?quality=90&amp;auto=webp 2000w" sizes="((min-width: 600px) and (max-width: 1004px)) 84vw, (min-width: 1005px) 80vw, 100vw" itemprop="url" itemid="https://static01.nyt.com/images/2019/02/21/nyregion/21winterutilitiesOAK15/merlin_56025490_f9412a36-eeb9-4a10-a41e-f324eb7a3248-articleLarge.jpg?quality=75&amp;auto=webp&amp;disable=upscale" />
</p>
<figcaption itemprop="caption description">
<span>In the late 1800s, overhead utilities were buried to lessen the exposure to winter weather.</span><span itemprop="copyrightHolder"><span>Credit</span><span>Kirsten Luce for The New York Times</span></span>

2
test/test-pages/nytimes-4/expected.html
Unescape Escape View File

@ -5,7 +5,7 @@
<div data-testid="photoviewer-wrapper">
<div data-testid="photoviewer-children">
<figure aria-label="media" role="group" itemscope="itemscope" itemprop="associatedMedia" itemid="https://static01.nyt.com/images/2018/09/15/business/15DEBTS01/merlin_138209730_5f3b5746-4962-4207-a24f-aea644a8636f-articleLarge.jpg?quality=90&amp;auto=webp" itemtype="http://schema.org/ImageObject">
<p><span>Image</span><img alt="" src="https://static01.nyt.com/images/2018/09/15/business/15DEBTS01/merlin_138209730_5f3b5746-4962-4207-a24f-aea644a8636f-articleLarge.jpg?quality=75&amp;auto=webp&amp;disable=upscale" srcset="https://static01.nyt.com/images/2018/09/15/business/15DEBTS01/merlin_138209730_5f3b5746-4962-4207-a24f-aea644a8636f-articleLarge.jpg?quality=90&amp;auto=webp 600w, https://static01.nyt.com/images/2018/09/15/business/15DEBTS01/merlin_138209730_5f3b5746-4962-4207-a24f-aea644a8636f-jumbo.jpg?quality=90&amp;auto=webp 1024w, https://static01.nyt.com/images/2018/09/15/business/15DEBTS01/merlin_138209730_5f3b5746-4962-4207-a24f-aea644a8636f-superJumbo.jpg?quality=90&amp;auto=webp 2048w" sizes="((min-width: 600px) and (max-width: 1004px)) 84vw, (min-width: 1005px) 60vw, 100vw" itemprop="url" itemid="https://static01.nyt.com/images/2018/09/15/business/15DEBTS01/merlin_138209730_5f3b5746-4962-4207-a24f-aea644a8636f-articleLarge.jpg?quality=75&amp;auto=webp&amp;disable=upscale" />
<p><span>Image</span><img alt="" src="https://static01.nyt.com/images/2018/09/15/business/15DEBTS01/merlin_138209730_5f3b5746-4962-4207-a24f-aea644a8636f-articleLarge.jpg?quality=75&amp;auto=webp&amp;disable=upscale" srcset="https://static01.nyt.com/images/2018/09/15/business/15DEBTS01/merlin_138209730_5f3b5746-4962-4207-a24f-aea644a8636f-articleLarge.jpg?quality=90&amp;auto=webp 600w,https://static01.nyt.com/images/2018/09/15/business/15DEBTS01/merlin_138209730_5f3b5746-4962-4207-a24f-aea644a8636f-jumbo.jpg?quality=90&amp;auto=webp 1024w,https://static01.nyt.com/images/2018/09/15/business/15DEBTS01/merlin_138209730_5f3b5746-4962-4207-a24f-aea644a8636f-superJumbo.jpg?quality=90&amp;auto=webp 2048w" sizes="((min-width: 600px) and (max-width: 1004px)) 84vw, (min-width: 1005px) 60vw, 100vw" itemprop="url" itemid="https://static01.nyt.com/images/2018/09/15/business/15DEBTS01/merlin_138209730_5f3b5746-4962-4207-a24f-aea644a8636f-articleLarge.jpg?quality=75&amp;auto=webp&amp;disable=upscale" />
</p>
<figcaption itemprop="caption description">
<span>Interest payments on the federal debt could surpass the Defense Department budget in 2023.</span><span itemprop="copyrightHolder"><span>Credit</span><span><span>Credit</span><span>Jeon Heon-Kyun/EPA, via Shutterstock</span></span></span>

Write Preview
Loading…
Cancel
Save