Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-20 05:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14678 from xundeenergie/dropzone-placeholder

Browse source 
Dropzone placeholder
This commit is contained in:
Hypolite Petovan 2025-01-12 08:32:52 -05:00 • committed by GitHub
commit 1a68fed349
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Module/Media/Photo/Upload.php
View file

@ -163,7 +163,7 @@ class Upload extends \Friendica\BaseModule
} }
$this->logger->info('upload done'); $this->logger->info('upload done');
$this->return(200, "\n\n" . Images::getBBCodeByResource($resource_id, $owner['nickname'], $preview, $image->getExt()) . "\n\n"); $this->return(200, Images::getBBCodeByResource($resource_id, $owner['nickname'], $preview, $image->getExt()));
} }
/** /**

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

@ -23,6 +23,10 @@ var DzFactory = function (max_imagesize) {
dictRemoveFile: dzStrings.dictRemoveFile, dictRemoveFile: dzStrings.dictRemoveFile,
dictMaxFilesExceeded: dzStrings.dictMaxFilesExceeded, dictMaxFilesExceeded: dzStrings.dictMaxFilesExceeded,
accept: function(file, done) { accept: function(file, done) {
const targetTextarea = document.getElementById(textareaElementId);
if (targetTextarea.setRangeText) {
targetTextarea.setRangeText("\n[upload-" + file.name + "]\n", targetTextarea.selectionStart, targetTextarea.selectionEnd, "end");
}
done(); done();
}, },
init: function() { init: function() {
@ -30,7 +34,8 @@ var DzFactory = function (max_imagesize) {
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
targetTextarea.setRangeText(serverResponse); let u = "[upload-" + file.name + "]";
targetTextarea.setRangeText(serverResponse, targetTextarea.value.indexOf(u), targetTextarea.value.indexOf(u) + u.length, "end");
} else { } else {
targetTextarea.focus(); targetTextarea.focus();
document.execCommand('insertText', false /*no UI*/, serverResponse); document.execCommand('insertText', false /*no UI*/, serverResponse);

5
view/templates/item/compose.tpl
View file

@ -92,6 +92,9 @@
<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div> <div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
<div id="permissions-section" style="display: none;"> <div id="permissions-section" style="display: none;">
<script>
dzFactory.setupDropzone('#dropzone-{{$id}}', 'comment-edit-text-{{$id}}');
</script>
{{if $type == 'post'}} {{if $type == 'post'}}
<h3>{{$l10n.visibility_title}}</h3> <h3>{{$l10n.visibility_title}}</h3>
{{$acl_selector nofilter}} {{$acl_selector nofilter}}
@ -113,8 +116,6 @@
</div> </div>
</div> </div>
<script> <script>
dzFactory.setupDropzone('#dropzone-{{$id}}', 'comment-edit-text-{{$id}}');
document.addEventListener("DOMContentLoaded", function() { document.addEventListener("DOMContentLoaded", function() {
var textareas = document.querySelectorAll(".expandable-textarea"); var textareas = document.querySelectorAll(".expandable-textarea");