diff --git a/assets/javascripts/discourse/components/docked-editor.js.es6 b/assets/javascripts/discourse/components/docked-editor.js.es6 index 6cfadba..a74fd06 100644 --- a/assets/javascripts/discourse/components/docked-editor.js.es6 +++ b/assets/javascripts/discourse/components/docked-editor.js.es6 @@ -15,6 +15,9 @@ export default DEditor.extend({ const $element = $(this.element); const $editorInput = $element.find('.d-editor-input'); this._applyMentionAutocomplete($editorInput); + this._textarea = this.element.querySelector("textarea.d-editor-input"); + this._$textarea = $(this._textarea); + this.set("ready", true); }, _applyMentionAutocomplete($editorInput) { diff --git a/assets/javascripts/discourse/components/docked-upload.js.es6 b/assets/javascripts/discourse/components/docked-upload.js.es6 index 7c34007..c08c24e 100644 --- a/assets/javascripts/discourse/components/docked-upload.js.es6 +++ b/assets/javascripts/discourse/components/docked-upload.js.es6 @@ -1,19 +1,22 @@ import UploadMixin from "discourse/mixins/upload"; +import UppyUploadMixin from "discourse/mixins/uppy-upload"; import Component from "@ember/component"; -export default Component.extend(UploadMixin, { - tagName: 'button', - classNames: 'docked-upload btn btn-small', - attributeBindings: ['uploading:disabled'], - type: 'PUT', +export default Component.extend(UppyUploadMixin, { + id: "docked-upload", + tagName: "button", + type: "quick_message_upload", + classNames: "docked-upload btn btn-small", + attributeBindings: ["uploading:disabled"], + fileInputSelector: ".docked-upload-file-input", input() { - return $(this.element).find('input'); + return $(this.element).find("input"); }, click(e) { - if (!$(e.target).is('input')) { - this.input().trigger('click'); + if (!$(e.target).is("input")) { + this.input().trigger("click"); } - } + }, }); diff --git a/assets/javascripts/discourse/templates/components/docked-upload.hbs b/assets/javascripts/discourse/templates/components/docked-upload.hbs index 7efddb9..dce2813 100644 --- a/assets/javascripts/discourse/templates/components/docked-upload.hbs +++ b/assets/javascripts/discourse/templates/components/docked-upload.hbs @@ -4,5 +4,5 @@ {{else}} {{d-icon "far-image" class='qm-upload-picture'}} - + {{/if}} diff --git a/assets/javascripts/discourse/widgets/docked-post.js.es6 b/assets/javascripts/discourse/widgets/docked-post.js.es6 index 7947722..e121711 100644 --- a/assets/javascripts/discourse/widgets/docked-post.js.es6 +++ b/assets/javascripts/discourse/widgets/docked-post.js.es6 @@ -8,7 +8,10 @@ class QuickPostCooked extends PostCooked { const $html = $(`