Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Use Ember getter and explicitly check for undefined (#16618) 

Context -> https://deprecations.emberjs.com/v3.x/#toc_ember-metal-get-with-default
This commit is contained in:
Isaac Janzen 2022-05-04 09:37:42 -05:00 committed by GitHub
parent db9ae32e41
commit 71a4e9db85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/app/components/d-editor.js
View File

@ -546,10 +546,12 @@ export default Component.extend(TextareaTextManipulation, {
// note this will only work for emojis starting with :
// eg: :-)
const emojiTranslation =
this.get("site.custom_emoji_translation") || {};
const allTranslations = Object.assign(
{},
translations,
this.getWithDefault("site.custom_emoji_translation", {})
emojiTranslation
);
if (allTranslations[full]) {
return resolve([allTranslations[full]]);

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

@ -120,10 +120,8 @@ export default Mixin.create(UppyS3Multipart, ExtendableUploader, {
onBeforeUpload: (files) => {
let tooMany = false;
const fileCount = Object.keys(files).length;
const maxFiles = this.getWithDefault(
"maxFiles",
this.siteSettings.simultaneous_uploads
);
const maxFiles =
this.maxFiles || this.siteSettings.simultaneous_uploads;
if (this.allowMultipleFiles) {
tooMany = maxFiles > 0 && fileCount > maxFiles;
@ -396,11 +394,8 @@ export default Mixin.create(UppyS3Multipart, ExtendableUploader, {
},
_xhrUploadUrl() {
return (
getUrl(this.getWithDefault("uploadUrl", this.uploadRootPath)) +
".json?client_id=" +
this.messageBus?.clientId
);
const uploadUrl = this.uploadUrl || this.uploadRootPath;
return getUrl(uploadUrl) + ".json?client_id=" + this.messageBus?.clientId;
},
_bindFileInputChange() {