Skip to content

fileuploader fixed #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
veronika-tseleva-cleantalk merged 1 commit into from
Aug 21, 2026
Merged

fileuploader fixed #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 42 additions & 33 deletions dist/doboard-widget-bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13829,45 +13829,54 @@ class FileUploader {

const currentOrigin = window.location.origin;

try {
const domtoimageLib = await this.loadDomToImage();
if (domtoimageLib) {
blob = await domtoimageLib.toBlob(document.body, {
bgcolor: bgColor,
width: window.innerWidth,
height: window.innerHeight,
style: {
transform: `translate(${-window.scrollX}px, ${-window.scrollY}px)`,
backgroundColor: bgColor
},
filter: (node) => {
if (node.classList && node.classList.contains('doboard_task_widget')) return false;
if (node.tagName === 'NOSCRIPT' || node.tagName === 'IFRAME') return false;

if (node.tagName === 'IMG' && node.src && node.src.startsWith('http')) {
try {
const url = new URL(node.src);
if (url.origin !== currentOrigin && !node.crossOrigin) return false;
} catch (e) {
return false;
}
}
let hasCssCorsError = false;
for (let i = 0; i < document.styleSheets.length; i++) {
try {
const rules = document.styleSheets[i].cssRules;
} catch (e) {
if (e.name === 'SecurityError') {
hasCssCorsError = true;
break;
}
}
}

if (node.tagName === 'LINK' && node.rel === 'stylesheet') {
try {
if (node.sheet && !node.sheet.cssRules) return false;
} catch (e) {
return false;
if (!hasCssCorsError) {
try {
const domtoimageLib = await this.loadDomToImage();
if (domtoimageLib) {
blob = await domtoimageLib.toBlob(document.body, {
bgcolor: bgColor,
width: window.innerWidth,
height: window.innerHeight,
style: {
transform: `translate(${-window.scrollX}px, ${-window.scrollY}px)`,
backgroundColor: bgColor
},
filter: (node) => {
if (node.classList && node.classList.contains('doboard_task_widget')) return false;
if (node.tagName === 'NOSCRIPT' || node.tagName === 'IFRAME') return false;

if (node.tagName === 'IMG' && node.src && node.src.startsWith('http')) {
try {
const url = new URL(node.src);
if (url.origin !== currentOrigin && !node.crossOrigin) return false;
} catch (e) { return false; }
}
return true;
}
});

return true;
if (blob && blob.size < 100) {
blob = null;
}
});
}
} catch (error) {
console.warn('SpotFix: dom-to-image failed.', error.message);
blob = null;
}
} catch (error) {
console.warn(error.message);
blob = null;
} else {
console.log('SpotFix: html2canvas.');
}

if (!blob) {
Expand Down
2 changes: 1 addition & 1 deletion dist/doboard-widget-bundle.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/doboard-widget-bundle.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

75 changes: 42 additions & 33 deletions js/src/fileuploader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,45 +432,54 @@ class FileUploader {

const currentOrigin = window.location.origin;

try {
const domtoimageLib = await this.loadDomToImage();
if (domtoimageLib) {
blob = await domtoimageLib.toBlob(document.body, {
bgcolor: bgColor,
width: window.innerWidth,
height: window.innerHeight,
style: {
transform: `translate(${-window.scrollX}px, ${-window.scrollY}px)`,
backgroundColor: bgColor
},
filter: (node) => {
if (node.classList && node.classList.contains('doboard_task_widget')) return false;
if (node.tagName === 'NOSCRIPT' || node.tagName === 'IFRAME') return false;

if (node.tagName === 'IMG' && node.src && node.src.startsWith('http')) {
try {
const url = new URL(node.src);
if (url.origin !== currentOrigin && !node.crossOrigin) return false;
} catch (e) {
return false;
}
}
let hasCssCorsError = false;
for (let i = 0; i < document.styleSheets.length; i++) {
try {
const rules = document.styleSheets[i].cssRules;
} catch (e) {
Comment on lines +437 to +439
if (e.name === 'SecurityError') {
hasCssCorsError = true;
break;
}
}
}

if (node.tagName === 'LINK' && node.rel === 'stylesheet') {
try {
if (node.sheet && !node.sheet.cssRules) return false;
} catch (e) {
return false;
if (!hasCssCorsError) {
try {
const domtoimageLib = await this.loadDomToImage();
if (domtoimageLib) {
blob = await domtoimageLib.toBlob(document.body, {
bgcolor: bgColor,
width: window.innerWidth,
height: window.innerHeight,
style: {
transform: `translate(${-window.scrollX}px, ${-window.scrollY}px)`,
backgroundColor: bgColor
},
filter: (node) => {
if (node.classList && node.classList.contains('doboard_task_widget')) return false;
if (node.tagName === 'NOSCRIPT' || node.tagName === 'IFRAME') return false;

if (node.tagName === 'IMG' && node.src && node.src.startsWith('http')) {
try {
const url = new URL(node.src);
if (url.origin !== currentOrigin && !node.crossOrigin) return false;
} catch (e) { return false; }
}
return true;
}
});

return true;
if (blob && blob.size < 100) {
blob = null;
}
Comment on lines +473 to 475
});
}
} catch (error) {
console.warn('SpotFix: dom-to-image failed.', error.message);
blob = null;
}
} catch (error) {
console.warn(error.message);
blob = null;
} else {
console.log('SpotFix: html2canvas.');
}

if (!blob) {
Expand Down