create factory for dropzones

diff --git a/mod/photos.php b/mod/photos.php
index d7d806bfc2f97eb1ff301165222393d2b984cc0c..06c0d1946a370dfa37c236dd9890e1d88315c056 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1141,7 +1141,7 @@ function photos_content(App $a)
                                                '$qcomment' => $qcomment,
                                                '$rand_num' => Crypto::randomDigits(12),
                                                // Dropzone
-                                               '$max_imagesize' => floor(Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')) / 1000000),
+                                               '$max_imagesize' => floor(\Friendica\Util\Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')) / 1000000),
                                        ]);
                                }
                        }

diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php
index d1744b9d72d5ac8137f064cafbbb1f83c19105eb..2f60eebc343e756060cb8f8f599fdca1b4f578d4 100644 (file)
--- a/src/Module/Item/Compose.php
+++ b/src/Module/Item/Compose.php
@@ -242,7 +242,7 @@ class Compose extends BaseModule
                        ]),
 
                        // Dropzone
-                       '$max_imagesize' => floor(Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')) / 1000000),
+                       '$max_imagesize' => floor(\Friendica\Util\Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')) / 1000000),
                ]);
        }
 }

diff --git a/view/theme/frio/templates/comment_item.tpl b/view/theme/frio/templates/comment_item.tpl
index 00ca396d11d92ca08cc7f9a5a4d27ae244ed0e24..c4fcb9f6279b16f13f43890958c429ac361099eb 100644 (file)
--- a/view/theme/frio/templates/comment_item.tpl
+++ b/view/theme/frio/templates/comment_item.tpl
@@ -67,45 +67,5 @@
 
 <script>
        Dropzone.autoDiscover = false;
-       var dropzone{{$id}} = new Dropzone( '#dropzone-{{$id}}', {
-               paramName: 'userfile', // The name that will be used to transfer the file
-               maxFilesize: {{$max_imagesize}}, // MB
-               url: '/media/photo/upload?response=url&album=',
-               accept: function(file, done) {
-                       done();
-               },
-               init: function() {
-                       this.on('success', function(file, serverResponse) {
-                               var target = $('#comment-edit-text-{{$id}}')
-                               var resp = $(serverResponse).find('div#content').text()
-                               if (target.setRangeText) {
-                                       //if setRangeText function is supported by current browser
-                                       target.setRangeText(' ' + $.trim(resp) + ' ')
-                               } else {
-                                       target.focus()
-                                       document.execCommand('insertText', false /*no UI*/, ' ' + $.trim(resp) + ' ');
-                               }
-                       });
-                       this.on('complete', function(file) {
-                               // Remove just uploaded file from dropzone, makes interface more clear.
-                               // Image can be seen in posting-preview
-                               // We need preview to get optical feedback about upload-progress.
-                               // you see success, when the bb-code link for image is inserted
-                               setTimeout(function(){
-                                       dropzone{{$id}}.removeFile(file);
-                               },5000);
-                       });
-               },
-       });
-       
-       // Enables Copy&Paste for this dropzone
-       $('#dropzone-{{$id}}').on('paste', function(event){
-               const items = (event.clipboardData || event.originalEvent.clipboardData).items;
-               items.forEach((item) => {
-                       if (item.kind === 'file') {
-                               // adds the file to your dropzone instance
-                               dropzone{{$id}}.addFile(item.getAsFile())
-                       }
-               })
-       });
+       dzFactory.setupDropzone('#dropzone-{{$id}}', $('#comment-edit-text-{{$id}}'), {{$max_imagesize}}); 
 </script>

diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl
index 478f190562bac907b92efc4828ae38c1f1b865cb..13104aa6a080b40bc87b2b0a2616cc1fdc5aa727 100644 (file)
--- a/view/theme/frio/templates/head.tpl
+++ b/view/theme/frio/templates/head.tpl
@@ -140,6 +140,8 @@
        {{/if}}
        <script type="text/javascript" src="view/theme/frio/js/textedit.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
        <script type="text/javascript" src="vendor/enyo/dropzone/dist/min/dropzone.min.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+       <script type="text/javascript" src="view/js/dropzone-factory.js?v={{$smarty.const.FRIENDICA_VERSION}}"></script>
+       <script type="text/javascript"> var dzFactory = new DzFactory();</script>
 
        {{* Include the strings which are needed for some js functions (e.g. translation)
 They are loaded into the html <head> so that js functions can use them *}}