github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 01:47:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
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 : // note this will only work for emojis starting with :
// eg: :-) // eg: :-)
const emojiTranslation =
this.get("site.custom_emoji_translation") || {};
const allTranslations = Object.assign( const allTranslations = Object.assign(
{}, {},
translations, translations,
this.getWithDefault("site.custom_emoji_translation", {}) emojiTranslation
); );
if (allTranslations[full]) { if (allTranslations[full]) {
return resolve([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) => { onBeforeUpload: (files) => {
let tooMany = false; let tooMany = false;
const fileCount = Object.keys(files).length; const fileCount = Object.keys(files).length;
const maxFiles = this.getWithDefault( const maxFiles =
"maxFiles", this.maxFiles || this.siteSettings.simultaneous_uploads;
this.siteSettings.simultaneous_uploads
);
if (this.allowMultipleFiles) { if (this.allowMultipleFiles) {
tooMany = maxFiles > 0 && fileCount > maxFiles; tooMany = maxFiles > 0 && fileCount > maxFiles;
@ -396,11 +394,8 @@ export default Mixin.create(UppyS3Multipart, ExtendableUploader, {
}, },
_xhrUploadUrl() { _xhrUploadUrl() {
return ( const uploadUrl = this.uploadUrl || this.uploadRootPath;
getUrl(this.getWithDefault("uploadUrl", this.uploadRootPath)) + return getUrl(uploadUrl) + ".json?client_id=" + this.messageBus?.clientId;
".json?client_id=" +
this.messageBus?.clientId
);
}, },
_bindFileInputChange() { _bindFileInputChange() {