Skip to content
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

fix an issue where overwriting uploads would fail #37

Merged
merged 4 commits into from
Aug 7, 2024
Merged

fix an issue where overwriting uploads would fail #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca16cd2
fix an issue where overwriting uploads would fail
mszulik Aug 7, 2024
ceaf625
change translation key name
mszulik Aug 7, 2024
a832d74
add comments
mszulik Aug 7, 2024
e72eb55
fix a crash when trying to overwrite an upload
mszulik Aug 7, 2024
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
4 changes: 2 additions & 2 deletions amigor/composer.lock
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 amigor/public/vendor/transmorpher/mix-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"/transmorpher.js": "/transmorpher.js?id=69ad22117fc232ba4481bd6dcd6e1dab",
"/transmorpher.js": "/transmorpher.js?id=5b7ab84ce745288f338db3682557a717",
"/transmorpher.css": "/transmorpher.css?id=56dbb0cba726c3e63f1c109f6b9a6f1b",
"/icons/delete.svg": "/icons/delete.svg?id=f88179ccc3649c47f2264315be6c0421",
"/icons/enlargen.svg": "/icons/enlargen.svg?id=9f560ce3f022646dbb826a066715a343",
Expand Down
25 changes: 17 additions & 8 deletions amigor/public/vendor/transmorpher/transmorpher.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/mix-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"/transmorpher.js": "/transmorpher.js?id=69ad22117fc232ba4481bd6dcd6e1dab",
"/transmorpher.js": "/transmorpher.js?id=5b7ab84ce745288f338db3682557a717",
"/transmorpher.css": "/transmorpher.css?id=56dbb0cba726c3e63f1c109f6b9a6f1b",
"/icons/delete.svg": "/icons/delete.svg?id=f88179ccc3649c47f2264315be6c0421",
"/icons/enlargen.svg": "/icons/enlargen.svg?id=9f560ce3f022646dbb826a066715a343",
Expand Down
25 changes: 17 additions & 8 deletions dist/transmorpher.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/lang/en/dropzone.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
'success' => 'Success',
'uploading' => 'Uploading',
'upload_canceled' => 'Upload canceled',
'upload_aborted' => 'Error, please try again.',
'validation_error' => 'There was an error when trying to validate media dimensions.',
'video_in_process' => 'A video is currently uploading or processing, do you want to overwrite it?',
'html_video_not_supported' => 'Your browser doesn\'t support HTML video. Here is a link to the video instead.'
Expand Down
20 changes: 15 additions & 5 deletions src/resources/js/transmorpher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ if (!window.transmorpherScriptLoaded) {
if (uploadingStateResponse.state === 'uploading' || uploadingStateResponse.state === 'processing') {
openUploadConfirmModal(
transmorpherIdentifier,
createCallbackWithArguments(reserveUploadSlot, transmorpherIdentifier, file.done)
createCallbackWithArguments(reserveUploadSlot, transmorpherIdentifier, file.done),
uploadingStateResponse.state
);
} else {
reserveUploadSlot(transmorpherIdentifier, file.done);
Expand Down Expand Up @@ -282,6 +283,10 @@ if (!window.transmorpherScriptLoaded) {
} else {
displayUploadResult(response, transmorpherIdentifier, uploadToken);
}


// Fixes undefined state after first upload.
document.querySelector(`#dz-${transmorpherIdentifier}`).dropzone.removeAllFiles();
}

window.displayUploadResult = function (uploadResult, transmorpherIdentifier, uploadToken) {
Expand Down Expand Up @@ -416,7 +421,7 @@ if (!window.transmorpherScriptLoaded) {
window.setVersion = function (transmorpherIdentifier, version) {
getState(transmorpherIdentifier).then(uploadingStateResponse => {
if (uploadingStateResponse.state === 'uploading' || uploadingStateResponse.state === 'processing') {
openUploadConfirmModal(transmorpherIdentifier, createCallbackWithArguments(makeSetVersionCall, transmorpherIdentifier, version));
openUploadConfirmModal(transmorpherIdentifier, createCallbackWithArguments(makeSetVersionCall, transmorpherIdentifier, version), uploadingStateResponse.state);
} else {
makeSetVersionCall(transmorpherIdentifier, version);
}
Expand Down Expand Up @@ -636,7 +641,7 @@ if (!window.transmorpherScriptLoaded) {
return date.toLocaleString();
}

window.openUploadConfirmModal = function (transmorpherIdentifier, callback) {
window.openUploadConfirmModal = function (transmorpherIdentifier, callback, uploadState) {
let modal = document.querySelector(`#modal-uc-${transmorpherIdentifier}`);
let dropzone = document.querySelector(`#dz-${transmorpherIdentifier}`).dropzone;
let previewElement = document.querySelector(`#dz-${transmorpherIdentifier} .dz-preview ~ .dz-preview`);
Expand All @@ -645,12 +650,17 @@ if (!window.transmorpherScriptLoaded) {
previewElement ? previewElement.style.display = 'none' : null;

modal.querySelector('.badge-error').onclick = function () {
previewElement ? previewElement.style.display = 'block' : null;
document.querySelector(`#modal-uc-${transmorpherIdentifier}`).classList.remove('d-flex');

if (dropzone.files[1] != null) {
dropzone.removeFile(dropzone.files[0]);
} else if (uploadState !== 'processing' && dropzone?.files[0]?.status !== Dropzone.ADDED) {
// This happens when the dropzone state was reset while initializing.
displayState(transmorpherIdentifier, 'error', media[transmorpherIdentifier].translations['upload_aborted']);
return;
}

previewElement ? previewElement.style.display = 'block' : null;
document.querySelector(`#modal-uc-${transmorpherIdentifier}`).classList.remove('d-flex');
callback();
}
}
Expand Down