apply changes from review

diff --git a/mod/photos.php b/mod/photos.php
index f9d4637c3a6ae81fa01db7a81940ed6cf41f633f..5b225489ec3043edee0769145631c3654a9c5c01 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -32,7 +32,6 @@ use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
-use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Photo;
@@ -1141,7 +1140,7 @@ function photos_content(App $a)
                                                '$qcomment' => $qcomment,
                                                '$rand_num' => Crypto::randomDigits(12),
                                                // Dropzone
-                                               '$max_imagesize' => round(\Friendica\Util\Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')) / 1000000,1),
+                                               '$max_imagesize' => round(\Friendica\Util\Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')) / 1000000, 1),
                                        ]);
                                }
                        }
@@ -1198,7 +1197,7 @@ function photos_content(App $a)
                                                '$qcomment' => $qcomment,
                                                '$rand_num' => Crypto::randomDigits(12),
                                                // Dropzone
-                                               '$max_imagesize' => round(Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')) / 1000000,1),
+                                               '$max_imagesize' => round(Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')) / 1000000, 1),
                                        ]);
                                }
 
@@ -1274,7 +1273,7 @@ function photos_content(App $a)
                                                        '$qcomment' => $qcomment,
                                                        '$rand_num' => Crypto::randomDigits(12),
                                                        // Dropzone
-                                                       '$max_imagesize' => round(Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')) / 1000000,1),
+                                                       '$max_imagesize' => round(Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')) / 1000000, 1),
                                                ]);
                                        }
                                }

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index e660c9ff4b843e2beecb9fcd42fd264916856091..1d7430e1933a0b97dd0225296b20bfeb5a5ff219 100644 (file)
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -35,7 +35,6 @@ use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\Theme;
 use Friendica\Database\DBA;
-use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item as ItemModel;
 use Friendica\Model\Post;
@@ -411,7 +410,7 @@ class Conversation
                        '$always_open_compose' => $this->pConfig->get($this->session->getLocalUserId(), 'frio', 'always_open_compose', false),
 
                        // Dropzone
-                       '$max_imagesize' => round(\Friendica\Util\Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')) / 1000000,1),
+                       '$max_imagesize' => round(\Friendica\Util\Strings::getBytesFromShorthand($this->config->get('system', 'maximagesize')) / 1000000, 1),
 
                ]);
 

diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php
index 1c1687976592c5573cd651e92339d9fe94aa52b7..19726eb71799e85c2cd97f193b834a484747c807 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' => round(\Friendica\Util\Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')) / 1000000,1),
+                       '$max_imagesize' => round(\Friendica\Util\Strings::getBytesFromShorthand($this->config->get('system', 'maximagesize')) / 1000000, 1),
                ]);
        }
 }

diff --git a/view/templates/item/compose.tpl b/view/templates/item/compose.tpl
index 29319a51e2a5730efa9e833db9da30f151c498ec..07db40d9c6b28e9e4bda69747f2c3a78debb6229 100644 (file)
--- a/view/templates/item/compose.tpl
+++ b/view/templates/item/compose.tpl
@@ -96,46 +96,5 @@
        </div>
 </div>
 <script>
-       Dropzone.autoDiscover = false;
-       var dropzoneCompose = 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(){
-                                       dropzoneCompose.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
-                               dropzoneCompose.addFile(item.getAsFile())
-                       }
-               })
-       });
+       dzFactory.setupDropzone('#dropzone-{{$id}}', $('#comment-edit-text-{{$id}}'), {{$max_imagesize}}); 
 </script>

diff --git a/view/theme/frio/templates/comment_item.tpl b/view/theme/frio/templates/comment_item.tpl
index c01e0c80ba8d12851b80db10e6820a9b200320e0..b61c1d6f878431d19376065da246213d00572086 100644 (file)
--- a/view/theme/frio/templates/comment_item.tpl
+++ b/view/theme/frio/templates/comment_item.tpl
@@ -66,7 +66,6 @@
 </div>
 
 <script>
-       Dropzone.autoDiscover = false;
        $('[id=comment-fake-text-{{$id}}]').on('focus', function() {
                dzFactory.setupDropzone('#dropzone-{{$id}}', $('#comment-edit-text-{{$id}}'), {{$max_imagesize}}); 
                $('[id=comment-fake-text-{{$id}}]') .prop('focus', null).off('focus')

diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl
index 13104aa6a080b40bc87b2b0a2616cc1fdc5aa727..436e3626b364132e8ee033bd962dc8306e62e4ac 100644 (file)
--- a/view/theme/frio/templates/head.tpl
+++ b/view/theme/frio/templates/head.tpl
@@ -141,7 +141,7 @@
        <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>
+       <script type="text/javascript"> var dzFactory = new DzFactory(); Dropzone.autoDiscover = false;</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 *}}

diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl
index 76359b9dab55f1c3b31756cbff65c4a7e2f3b028..1b77ded421cb1a4621e5ddb6520dba23408b60fb 100644 (file)
--- a/view/theme/frio/templates/jot.tpl
+++ b/view/theme/frio/templates/jot.tpl
@@ -180,46 +180,5 @@ can load different content into the jot modal (e.g. the item edit jot)
 </script>
 
 <script>
-       Dropzone.autoDiscover = false;
-       var dropzoneJot = new Dropzone( '#jot-text-wrap', {
-               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 = $('#profile-jot-text')
-                               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(){
-                                       dropzoneJot.removeFile(file);
-                               },5000);
-                       });
-               },
-       });
-
-       // Enables Copy&Paste for this dropzone
-       $('#jot-text-wrap').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
-                               dropzoneJot.addFile(item.getAsFile())
-                       }
-               })
-       })
+       dzFactory.setupDropzone('#jot-text-wrap', $('#profile-jot-text'), {{$max_imagesize}}); 
 </script>