Friendica/friendica-github
1
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2025-02-10 23:34:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14696 from xundeenergie/dropzone-upload-improvement

Browse source 
Do not change cursor position while replacing upload-placeholder, add video, audio and documents to upload
This commit is contained in:
Hypolite Petovan 2025-01-22 22:00:07 -05:00 • committed by GitHub
commit c426b27287
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
view/js/dropzone-factory.js
View file

@ -9,7 +9,7 @@ var DzFactory = function (max_imagesize) {
paramName: 'userfile', // The name that will be used to transfer the file paramName: 'userfile', // The name that will be used to transfer the file
maxFilesize: max_imagesize, // MB maxFilesize: max_imagesize, // MB
url: '/media/photo/upload?album=', url: '/media/photo/upload?album=',
acceptedFiles: 'image/*', acceptedFiles: 'image/*,video/*,audio/*,application/*',
clickable: true, clickable: true,
dictDefaultMessage: dzStrings.dictDefaultMessage, dictDefaultMessage: dzStrings.dictDefaultMessage,
dictFallbackMessage: dzStrings.dictFallbackMessage, dictFallbackMessage: dzStrings.dictFallbackMessage,
@ -25,17 +25,47 @@ var DzFactory = function (max_imagesize) {
accept: function(file, done) { accept: function(file, done) {
const targetTextarea = document.getElementById(textareaElementId); const targetTextarea = document.getElementById(textareaElementId);
if (targetTextarea.setRangeText) { if (targetTextarea.setRangeText) {
targetTextarea.setRangeText("\n[upload-" + file.name + "]\n", targetTextarea.selectionStart, targetTextarea.selectionEnd, "end"); targetTextarea.setRangeText("\n[!upload-" + file.name + "]\n", targetTextarea.selectionStart, targetTextarea.selectionEnd, "end");
} }
done(); done();
}, },
init: function() { init: function() {
this.on("processing", function(file) {
switch(file.type) {
case String(file.type.match(/image\/.*/)):
this.options.url = "/media/photo/upload?album=";
break;
default:
this.options.url = "/media/attachment/upload?response=json";
}
});
this.on('success', function(file, serverResponse) { this.on('success', function(file, serverResponse) {
const targetTextarea = document.getElementById(textareaElementId); const targetTextarea = document.getElementById(textareaElementId);
if (targetTextarea.setRangeText) { if (targetTextarea.setRangeText) {
//if setRangeText function is supported by current browser //if setRangeText function is supported by current browser
let u = "[upload-" + file.name + "]"; let u = "[!upload-" + file.name + "]";
targetTextarea.setRangeText(serverResponse, targetTextarea.value.indexOf(u), targetTextarea.value.indexOf(u) + u.length, "end"); let srp = serverResponse;
if (typeof serverResponse === 'object' &&
serverResponse.constructor === Object) {
if (serverResponse.ok) {
srp = "[attachment]" +
window.location.protocol +
"//" +
window.location.host +
"/attach/" +
serverResponse.id +
"[/attachment]";
} else {
srp = "Upload failed";
}
}
let c = targetTextarea.selectionStart;
if (c > targetTextarea.value.indexOf(u)) {
c = c + serverResponse.length - u.length;
}
targetTextarea.setRangeText(srp, targetTextarea.value.indexOf(u), targetTextarea.value.indexOf(u) + u.length);
targetTextarea.selectionStart = c;
targetTextarea.selectionEnd = c;
} else { } else {
targetTextarea.focus(); targetTextarea.focus();
document.execCommand('insertText', false /*no UI*/, serverResponse); document.execCommand('insertText', false /*no UI*/, serverResponse);