clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make dropzone work on editing postings/Comments

This commit is contained in:
Jakobus Schürz 2023-03-13 22:50:59 +01:00
parent 8242d1c72b
commit 00ae7d0f59
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Module/Post/Edit.php
View File

@ -28,6 +28,7 @@ use Friendica\Core\Hook;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Core\Session\Capability\IHandleUserSessions; use Friendica\Core\Session\Capability\IHandleUserSessions;
use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Post; use Friendica\Model\Post;
use Friendica\Model\User; use Friendica\Model\User;
@ -35,8 +36,8 @@ use Friendica\Module\Response;
use Friendica\Navigation\SystemMessages; use Friendica\Navigation\SystemMessages;
use Friendica\Network\HTTPException; use Friendica\Network\HTTPException;
use Friendica\Util\Crypto; use Friendica\Util\Crypto;
use Friendica\Util\Strings;
use Friendica\Util\Profiler; use Friendica\Util\Profiler;
use Friendica\DI;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
/** /**
@ -184,6 +185,9 @@ class Edit extends BaseModule
'$compose_link_title' => $this->t('Open Compose page'), '$compose_link_title' => $this->t('Open Compose page'),
// Dropzone // Dropzone
//'$max_imagesize' => Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
//'$max_imagesize' => \Friendica\\Util\\Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
// both not working, so just workaround here until fixed
'$max_imagesize' => DI::config()->get('system', 'maximagesize'), '$max_imagesize' => DI::config()->get('system', 'maximagesize'),
]); ]);

4
view/templates/item/compose.tpl
View File

@ -1,4 +1,4 @@
<div class="generic-page-wrapper"> <div class="generic-page-wrapper"css>
<h2>{{$l10n.compose_title}}</h2> <h2>{{$l10n.compose_title}}</h2>
{{if $l10n.always_open_compose}} {{if $l10n.always_open_compose}}
<p>{{$l10n.always_open_compose nofilter}}</p> <p>{{$l10n.always_open_compose nofilter}}</p>
@ -97,7 +97,7 @@
</div> </div>
<script> <script>
Dropzone.autoDiscover = false; Dropzone.autoDiscover = false;
var maxis = {{$max_imagesize}} / 100000; var maxis = {{$max_imagesize}} / 10^6;
var dropzoneCompose = new Dropzone( '#comment-edit-form-{{$id}}', { var dropzoneCompose = new Dropzone( '#comment-edit-form-{{$id}}', {
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: maxis, // MB maxFilesize: maxis, // MB

2
view/theme/frio/templates/comment_item.tpl
View File

@ -67,7 +67,7 @@
<script> <script>
Dropzone.autoDiscover = false; Dropzone.autoDiscover = false;
var maxis = {{$max_imagesize}} / 100000; var maxis = {{$max_imagesize}} / 10^6;
var dropzone{{$id}} = new Dropzone( '#comment-edit-wrapper-{{$id}}', { var dropzone{{$id}} = new Dropzone( '#comment-edit-wrapper-{{$id}}', {
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: maxis, // MB maxFilesize: maxis, // MB

16
view/theme/frio/templates/jot.tpl
View File

@ -70,7 +70,7 @@
</div> </div>
</div> </div>
<div id="jot-modal-body" class="modal-body dropzone"> <div id="jot-modal-body" class="modal-body">
<form id="profile-jot-form" action="{{$action}}" method="post"> <form id="profile-jot-form" action="{{$action}}" method="post">
<div id="profile-jot-wrapper" aria-labelledby="jot-text-lnk" role="tabpanel" aria-hidden="false"> <div id="profile-jot-wrapper" aria-labelledby="jot-text-lnk" role="tabpanel" aria-hidden="false">
<div> <div>
@ -163,26 +163,26 @@
{{* The jot modal - We use a own modal for the jot and not the standard modal {{* The jot modal - We use a own modal for the jot and not the standard modal
from the page template. This is because the special structure of the jot from the page template. This is because the special structure of the jot
(e.g.jot navigation tabs in the modal titel area). (e.g.jot navigation tabs in the modal titel area).
The in the frio theme the jot will loaded regulary and is hidden by default.) Then in the frio theme the jot will loaded regulary and is hidden by default.)
The js function jotShow() loads the jot into the modal. With this structure we The js function jotShow() loads the jot into the modal. With this structure we
can load different content into the jot moadl (e.g. the item edit jot) can load different content into the jot modal (e.g. the item edit jot)
*}} *}}
<div id="jot-modal" class="modal fade" role="dialog"> <div id="jot-modal" class="modal fade" role="dialog">
<div class="modal-dialog"> <div class="modal-dialog">
<div id="jot-modal-content" class="modal-content"></div> <div id="jot-modal-content" class="modal-content dropzone"></div>
</div> </div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$('iframe').load(function() { $('iframe').load(function() {
this.style.height = this.contentWindow.document.body.offsetHeight + 'px'; this.style.height = this.contentWindow.document.body.offsetHeight + 'px';
}); });
</script> </script>
<script> <script>
Dropzone.autoDiscover = false; Dropzone.autoDiscover = false;
var maxis = {{$max_imagesize}} / 100000; var maxis = {{$max_filesize}} / 10^6;
var dropzoneJot = new Dropzone( '#jot-modal-body', { var dropzoneJot = new Dropzone( '#jot-modal-content', {
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: maxis, // MB maxFilesize: maxis, // MB
previewsContainer: '#dz-preview-jot', previewsContainer: '#dz-preview-jot',
@ -205,7 +205,7 @@ can load different content into the jot moadl (e.g. the item edit jot)
}, },
}); });
$('#jot-modal-body').on('paste', function(event){ $('#jot-modal-content').on('paste', function(event){
const items = (event.clipboardData || event.originalEvent.clipboardData).items; const items = (event.clipboardData || event.originalEvent.clipboardData).items;
items.forEach((item) => { items.forEach((item) => {
if (item.kind === 'file') { if (item.kind === 'file') {