mirror/html2canvas
1
0
Fork 0
mirror of https://github.com/niklasvh/html2canvas.git synced 2023-08-10 21:13:10 +03:00
Code Issues Projects Releases Wiki Activity

APPS-21943 - exclude urls which don't support params

Browse Source
This commit is contained in:
go2rob 2021-05-09 22:50:43 +05:30
parent 92702e8987
commit 3a11163a14
8 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dist/html2canvas.esm.js vendored
View File

@ -2529,14 +2529,13 @@ var Cache = /** @class */ (function () {
//ios safari 10.3 taints canvas with data urls unless crossOrigin is set to anonymous
var timeStamp = new Date().getTime();
var hasParamsRegex = /\?.+/;
// pbs.twimg.com - twitter images don't support params and returns 404
var urlsToExclude = /pbs\.twimg\.com/;
if (isInlineBase64Image(src) || useCORS) {
img.crossOrigin = 'anonymous';
img.setAttribute('crossOrigin', 'anonymous');
if (hasParamsRegex.test(src)) {
src = src + '&v=' + timeStamp;
}
else {
src = src + '?v=' + timeStamp;
if (!urlsToExclude.test(src)) {
src = hasParamsRegex.test(src) ? src + '&v=' + timeStamp : src + '?v=' + timeStamp;
}
img.src = src;
}

2
dist/html2canvas.esm.js.map vendored
View File

File diff suppressed because one or more lines are too long

9
dist/html2canvas.js vendored
View File

@ -2535,14 +2535,13 @@
//ios safari 10.3 taints canvas with data urls unless crossOrigin is set to anonymous
var timeStamp = new Date().getTime();
var hasParamsRegex = /\?.+/;
// pbs.twimg.com - twitter images don't support params and returns 404
var urlsToExclude = /pbs\.twimg\.com/;
if (isInlineBase64Image(src) || useCORS) {
img.crossOrigin = 'anonymous';
img.setAttribute('crossOrigin', 'anonymous');
if (hasParamsRegex.test(src)) {
src = src + '&v=' + timeStamp;
}
else {
src = src + '?v=' + timeStamp;
if (!urlsToExclude.test(src)) {
src = hasParamsRegex.test(src) ? src + '&v=' + timeStamp : src + '?v=' + timeStamp;
}
img.src = src;
}

2
dist/html2canvas.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/html2canvas.min.js vendored
View File

File diff suppressed because one or more lines are too long

9
dist/lib/core/cache-storage.js vendored
View File

@ -141,14 +141,13 @@ var Cache = /** @class */ (function () {
//ios safari 10.3 taints canvas with data urls unless crossOrigin is set to anonymous
var timeStamp = new Date().getTime();
var hasParamsRegex = /\?.+/;
// pbs.twimg.com - twitter images don't support params and returns 404
var urlsToExclude = /pbs\.twimg\.com/;
if (isInlineBase64Image(src) || useCORS) {
img.crossOrigin = 'anonymous';
img.setAttribute('crossOrigin', 'anonymous');
if (hasParamsRegex.test(src)) {
src = src + '&v=' + timeStamp;
}
else {
src = src + '?v=' + timeStamp;
if (!urlsToExclude.test(src)) {
src = hasParamsRegex.test(src) ? src + '&v=' + timeStamp : src + '?v=' + timeStamp;
}
img.src = src;
}

2
dist/lib/core/cache-storage.js.map vendored
View File

File diff suppressed because one or more lines are too long

8
src/core/cache-storage.ts
View File

@ -127,13 +127,13 @@ export class Cache {
//ios safari 10.3 taints canvas with data urls unless crossOrigin is set to anonymous
const timeStamp = new Date().getTime();
const hasParamsRegex = /\?.+/;
// pbs.twimg.com - twitter images don't support params and returns 404
const urlsToExclude = /pbs\.twimg\.com/;
if (isInlineBase64Image(src) || useCORS) {
img.crossOrigin = 'anonymous';
img.setAttribute('crossOrigin', 'anonymous');
if (hasParamsRegex.test(src)) {
src = src +'&v='+timeStamp;
} else {
src = src +'?v='+timeStamp;
if (!urlsToExclude.test(src)) {
src = hasParamsRegex.test(src) ? src +'&v='+timeStamp : src +'?v='+timeStamp;
}
img.src = src;
}