REFACTOR: Move upload utilities to their own file

This commit is contained in:
Robin Ward
2019-11-14 11:56:12 -05:00
parent c83ae9a79f
commit d4b7c028fa
9 changed files with 546 additions and 528 deletions
@@ -31,14 +31,17 @@ import { findRawTemplate } from "discourse/lib/raw-templates";
import { iconHTML } from "discourse-common/lib/icon-library";
import {
tinyAvatar,
displayErrorForUpload,
getUploadMarkdown,
validateUploadedFiles,
authorizesOneOrMoreImageExtensions,
formatUsername,
clipboardData,
safariHacksDisabled
} from "discourse/lib/utilities";
import {
validateUploadedFiles,
authorizesOneOrMoreImageExtensions,
getUploadMarkdown,
displayErrorForUpload
} from "discourse/lib/uploads";
import {
cacheShortUploadUrl,
resolveAllShortUrls
@@ -82,7 +85,7 @@ export default Component.extend({
if (requiredCategoryMissing) {
return "composer.reply_placeholder_choose_category";
} else {
const key = authorizesOneOrMoreImageExtensions()
const key = authorizesOneOrMoreImageExtensions(this.currentUser.staff)
? "reply_placeholder"
: "reply_placeholder_no_images";
return `composer.${key}`;
@@ -700,6 +703,7 @@ export default Component.extend({
if (this._pasted) data.formData.pasted = true;
const opts = {
user: this.currentUser,
isPrivateMessage,
allowStaffToUploadAnyFileInPm: this.siteSettings
.allow_staff_to_upload_any_file_in_pm