mirror of
https://github.com/niklasvh/html2canvas.git
synced 2023-08-10 21:13:10 +03:00
handle existing params
This commit is contained in:
16
dist/lib/core/cache-storage.js
vendored
16
dist/lib/core/cache-storage.js
vendored
@ -139,15 +139,27 @@ var Cache = /** @class */ (function () {
|
||||
img.onload = function () { return resolve(img); };
|
||||
img.onerror = reject;
|
||||
//ios safari 10.3 taints canvas with data urls unless crossOrigin is set to anonymous
|
||||
var timeStamp = new Date().getTime();
|
||||
var hasParamsRegex = /\?.+/;
|
||||
if (isInlineBase64Image(src) || useCORS) {
|
||||
img.crossOrigin = 'anonymous';
|
||||
img.setAttribute('crossOrigin', 'anonymous');
|
||||
src = src + '?v=' + new Date().getTime();
|
||||
if (hasParamsRegex.test(src)) {
|
||||
src = src + '&v=' + timeStamp;
|
||||
}
|
||||
else {
|
||||
src = src + '?v=' + timeStamp;
|
||||
}
|
||||
img.src = src;
|
||||
}
|
||||
img.crossOrigin = 'anonymous';
|
||||
img.setAttribute('crossOrigin', 'anonymous');
|
||||
src = src + '?v=' + new Date().getTime();
|
||||
if (hasParamsRegex.test(src)) {
|
||||
src = src + '&v=' + timeStamp;
|
||||
}
|
||||
else {
|
||||
src = src + '?v=' + timeStamp;
|
||||
}
|
||||
img.src = src;
|
||||
if (img.complete === true) {
|
||||
// Inline XML images may fail to parse, throwing an Error later on
|
||||
|
2
dist/lib/core/cache-storage.js.map
vendored
2
dist/lib/core/cache-storage.js.map
vendored
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user