Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-15 09:45:52 +01:00
Code Issues Packages Projects Releases Activity

refactor uploading files

Browse Source
This commit is contained in:
zadam
2023-06-30 15:25:45 +02:00
parent 0802b81807
commit a0d958bf12
8 changed files with 77 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/public/app/widgets/buttons/attachments_actions.js
View File

@@ -64,18 +64,7 @@ export default class AttachmentActionsWidget extends BasicWidget {
const fileToUpload = this.$uploadNewRevisionInput[0].files[0]; // copy to allow reset below
this.$uploadNewRevisionInput.val('');
const formData = new FormData();
formData.append('upload', fileToUpload);
const result = await $.ajax({
url: `${window.glob.baseApiUrl}attachments/${this.attachmentId}/file`,
headers: await server.getHeaders(),
data: formData,
type: 'PUT',
timeout: 60 * 60 * 1000,
contentType: false, // NEEDED, DON'T REMOVE THIS
processData: false, // NEEDED, DON'T REMOVE THIS
});
const result = await server.upload(`attachments/${this.attachmentId}/file`, fileToUpload);
if (result.uploaded) {
toastService.showMessage("New attachment revision has been uploaded.");

8
src/public/app/widgets/note_context_aware_widget.js
View File

@@ -49,16 +49,8 @@ export default class NoteContextAwareWidget extends BasicWidget {
async refresh() {
if (this.isEnabled()) {
const start = Date.now();
this.toggleInt(true);
await this.refreshWithNote(this.note);
const end = Date.now();
if (glob.PROFILING_LOG && end - start > 10) {
console.log(`Refresh of ${this.componentId} took ${end-start}ms`);
}
}
else {
this.toggleInt(false);

13
src/public/app/widgets/ribbon_widgets/file_properties.js
View File

@@ -100,18 +100,7 @@ export default class FilePropertiesWidget extends NoteContextAwareWidget {
const fileToUpload = this.$uploadNewRevisionInput[0].files[0]; // copy to allow reset below
this.$uploadNewRevisionInput.val('');
const formData = new FormData();
formData.append('upload', fileToUpload);
const result = await $.ajax({
url: `${window.glob.baseApiUrl}notes/${this.noteId}/file`,
headers: await server.getHeaders(),
data: formData,
type: 'PUT',
timeout: 60 * 60 * 1000,
contentType: false, // NEEDED, DON'T REMOVE THIS
processData: false, // NEEDED, DON'T REMOVE THIS
});
const result = await server.upload(`notes/${this.noteId}/file`, fileToUpload);
if (result.uploaded) {
toastService.showMessage("New file revision has been uploaded.");

13
src/public/app/widgets/ribbon_widgets/image_properties.js
View File

@@ -84,18 +84,7 @@ export default class ImagePropertiesWidget extends NoteContextAwareWidget {
const fileToUpload = this.$uploadNewRevisionInput[0].files[0]; // copy to allow reset below
this.$uploadNewRevisionInput.val('');
const formData = new FormData();
formData.append('upload', fileToUpload);
const result = await $.ajax({
url: `${window.glob.baseApiUrl}images/${this.noteId}`,
headers: await server.getHeaders(),
data: formData,
type: 'PUT',
timeout: 60 * 60 * 1000,
contentType: false, // NEEDED, DON'T REMOVE THIS
processData: false, // NEEDED, DON'T REMOVE THIS
});
const result = await server.upload(`images/${this.noteId}`, fileToUpload);
if (result.uploaded) {
toastService.showMessage("New image revision has been uploaded.");

2
src/public/app/widgets/type_widgets/attachment_detail.js
View File

@@ -57,7 +57,7 @@ export default class AttachmentDetailTypeWidget extends TypeWidget {
})
);
const attachment = await froca.getAttachment(this.attachmentId);
const attachment = await froca.getAttachment(this.attachmentId, true);
if (!attachment) {
this.$wrapper.html("<strong>This attachment has been deleted.</strong>");