IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Add useUploadPlaceholders to composer-upload-uppy (#16272)

Browse Source 
This option is being added because some composer derivatives
like the chat composer use ComposerUploadUppy, but do not
need the placeholder text for uploads to be inserted/replaced.
This way those components can set useUploadPlaceholders to
false to avoid it.
This commit is contained in:
Martin Brennan
2022-03-24 14:50:18 +10:00
committed by GitHub
parent 1341baaeba
commit 817035b557
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/assets/javascripts/discourse/app/mixins/composer-upload-uppy.js
View File

@@ -37,6 +37,7 @@ import { run } from "@ember/runloop";
export default Mixin.create(ExtendableUploader, UppyS3Multipart, {
uploadRootPath: "/uploads",
uploadTargetBound: false,
useUploadPlaceholders: true,
@bind
_cancelSingleUpload(data) {
@@ -289,10 +290,14 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, {
this.placeholders[file.id] = {
uploadPlaceholder: placeholder,
};
this.appEvents.trigger(
`${this.composerEventPrefix}:insert-text`,
placeholder
);
if (this.useUploadPlaceholders) {
this.appEvents.trigger(
`${this.composerEventPrefix}:insert-text`,
placeholder
);
}
this.appEvents.trigger(
`${this.composerEventPrefix}:upload-started`,
file.name
@@ -315,11 +320,13 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, {
cacheShortUploadUrl(upload.short_url, upload);
this.appEvents.trigger(
`${this.composerEventPrefix}:replace-text`,
this.placeholders[file.id].uploadPlaceholder.trim(),
markdown
);
if (this.useUploadPlaceholders) {
this.appEvents.trigger(
`${this.composerEventPrefix}:replace-text`,
this.placeholders[file.id].uploadPlaceholder.trim(),
markdown
);
}
this._resetUpload(file, { removePlaceholder: false });
this.appEvents.trigger(
@@ -347,11 +354,13 @@ export default Mixin.create(ExtendableUploader, UppyS3Multipart, {
if (this.userCancelled) {
Object.values(this.placeholders).forEach((data) => {
run(() => {
this.appEvents.trigger(
`${this.composerEventPrefix}:replace-text`,
data.uploadPlaceholder,
""
);
if (this.useUploadPlaceholders) {
this.appEvents.trigger(
`${this.composerEventPrefix}:replace-text`,
data.uploadPlaceholder,
""
);
}
});
});