diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php index f23333911..249190b1a 100644 --- a/src/Content/Conversation.php +++ b/src/Content/Conversation.php @@ -408,7 +408,6 @@ class Conversation '$compose_link_title' => $this->l10n->t('Open Compose page'), '$always_open_compose' => $this->pConfig->get($this->session->getLocalUserId(), 'frio', 'always_open_compose', false), - ]); diff --git a/view/js/dropzone-factory.js b/view/js/dropzone-factory.js index a3a3e6c36..21ea5ebbc 100644 --- a/view/js/dropzone-factory.js +++ b/view/js/dropzone-factory.js @@ -1,6 +1,6 @@ var DzFactory = function () { - this.createDropzone = function(dropSelector, textareaSelector) { - return new Dropzone( dropSelector, { + this.createDropzone = function(dropSelector, textareaElementId) { + return new Dropzone(dropSelector, { paramName: 'userfile', // The name that will be used to transfer the file maxFilesize: max_imagesize, // MB url: '/media/photo/upload?response=url&album=', @@ -12,7 +12,7 @@ var DzFactory = function () { }, init: function() { this.on('success', function(file, serverResponse) { - const targetTextarea = document.getElementById(textareaSelector); + const targetTextarea = document.getElementById(textareaElementId); const bbcodeString = $(serverResponse).find('div#content').text(); if (targetTextarea.setRangeText) { //if setRangeText function is supported by current browser @@ -23,7 +23,7 @@ var DzFactory = function () { } }); this.on('complete', function(file) { - var dz = this; + const dz = this; // 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. @@ -55,8 +55,8 @@ var DzFactory = function () { }) }; - this.setupDropzone = function(dropSelector, textareaSelector) { - var dropzone = this.createDropzone(dropSelector, textareaSelector); + this.setupDropzone = function(dropSelector, textareaElementId) { + var dropzone = this.createDropzone(dropSelector, textareaElementId); $(dropSelector).on('paste', function(event) { dzFactory.copyPaste(event, dropzone); }) diff --git a/view/theme/frio/templates/comment_item.tpl b/view/theme/frio/templates/comment_item.tpl index 81664cf0f..2d977d807 100644 --- a/view/theme/frio/templates/comment_item.tpl +++ b/view/theme/frio/templates/comment_item.tpl @@ -68,12 +68,12 @@