anton/preland
4
0 Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Изолировать callbacks отменённой загрузки (#9)

Browse Source
This commit is contained in:
Panfilov Konstantin committed 2026-10-20 18:33:12 +03:00
1 parent d70d396670
commit 5afa71ec84
1 file changed
+7 -4
Download Patch File Download Diff File Expand all files Collapse all files
components/form.php
+7 -4
View File
@@ -223,6 +223,7 @@ $basePickerAccept = 'image/jpeg,image/png,image/gif,image/webp,image/bmp,image/a
xhr.withCredentials = true; xhr.withCredentials = true;
xhr.setRequestHeader('Accept', 'application/json'); xhr.setRequestHeader('Accept', 'application/json');
xhr.onload = async () => { xhr.onload = async () => {
if (attempt !== uploadAttempt || leavingUploadPage) return;
if (xhr.status >= 200 && xhr.status < 300) { if (xhr.status >= 200 && xhr.status < 300) {
try { const result = JSON.parse(xhr.responseText); if (!result?.id) throw new Error(); await recovery.accepted({id: result.id}); redirectToTour(record); } try { const result = JSON.parse(xhr.responseText); if (!result?.id) throw new Error(); await recovery.accepted({id: result.id}); redirectToTour(record); }
catch (_) { showUploadError(genericErrorMsg); } catch (_) { showUploadError(genericErrorMsg); }
@@ -230,9 +231,9 @@ $basePickerAccept = 'image/jpeg,image/png,image/gif,image/webp,image/bmp,image/a
} }
showUploadError(genericErrorMsg); showUploadError(genericErrorMsg);
}; };
xhr.onerror = () => showUploadError(genericErrorMsg, true); xhr.onerror = () => { if (attempt === uploadAttempt && !leavingUploadPage) showUploadError(genericErrorMsg, true); };
xhr.send(formData); xhr.send(formData);
} catch (_) { showUploadError(genericErrorMsg); } } catch (_) { if (attempt === uploadAttempt && !leavingUploadPage) showUploadError(genericErrorMsg); }
} }
function uploadFile(file, saved = null) { function uploadFile(file, saved = null) {
@@ -244,9 +245,10 @@ $basePickerAccept = 'image/jpeg,image/png,image/gif,image/webp,image/bmp,image/a
const record = saved || await recovery.remember(new File([bytes], file.name, {type: file.type, lastModified: file.lastModified}), metadata()); const record = saved || await recovery.remember(new File([bytes], file.name, {type: file.type, lastModified: file.lastModified}), metadata());
if (attempt === uploadAttempt && !leavingUploadPage) uploadPreparedFile(file, bytes, record); if (attempt === uploadAttempt && !leavingUploadPage) uploadPreparedFile(file, bytes, record);
}) })
.catch(() => showUploadError(genericErrorMsg)); .catch(() => { if (attempt === uploadAttempt && !leavingUploadPage) showUploadError(genericErrorMsg); });
} }
function uploadPreparedFile(file, bytes, record) { function uploadPreparedFile(file, bytes, record) {
const attempt = uploadAttempt;
const xhr = new XMLHttpRequest(); const xhr = new XMLHttpRequest();
const formData = new FormData(); const formData = new FormData();
// Ключ загрузки: по нему сайт передаёт её в сессию посетителя (/api/images/public/claim, годен 30 мин). // Ключ загрузки: по нему сайт передаёт её в сессию посетителя (/api/images/public/claim, годен 30 мин).
@@ -268,6 +270,7 @@ $basePickerAccept = 'image/jpeg,image/png,image/gif,image/webp,image/bmp,image/a
}; };
xhr.onload = async () => { xhr.onload = async () => {
if (attempt !== uploadAttempt || leavingUploadPage) return;
if (xhr.status >= 200 && xhr.status < 300) { if (xhr.status >= 200 && xhr.status < 300) {
let response; let response;
try { try {
@@ -297,7 +300,7 @@ $basePickerAccept = 'image/jpeg,image/png,image/gif,image/webp,image/bmp,image/a
}; };
xhr.onerror = () => { xhr.onerror = () => {
showUploadError(genericErrorMsg, true); if (attempt === uploadAttempt && !leavingUploadPage) showUploadError(genericErrorMsg, true);
}; };
xhr.send(formData); xhr.send(formData);