diff --git a/app/assets/javascripts/admin/addon/components/form-template/row-item.js b/app/assets/javascripts/admin/addon/components/form-template/row-item.js index c4de1a616c2..b5e8dd30066 100644 --- a/app/assets/javascripts/admin/addon/components/form-template/row-item.js +++ b/app/assets/javascripts/admin/addon/components/form-template/row-item.js @@ -12,7 +12,7 @@ export default class FormTemplateRowItem extends Component { @service site; get activeCategories() { - return this.site?.categories?.filter((c) => + return this.site.categories?.filter((c) => c["form_template_ids"].includes(this.args.template.id) ); } diff --git a/app/assets/javascripts/discourse/app/components/json-editor.js b/app/assets/javascripts/discourse/app/components/json-editor.js index 2f622a6f1dd..a02a7cc9fdb 100644 --- a/app/assets/javascripts/discourse/app/components/json-editor.js +++ b/app/assets/javascripts/discourse/app/components/json-editor.js @@ -53,7 +53,7 @@ export default Component.extend({ const errors = this.editor.validate(); if (!errors.length) { const fieldValue = JSON.stringify(this.editor.getValue()); - this?.saveChangesCallback(fieldValue); + this.saveChangesCallback(fieldValue); } else { this.appEvents.trigger("modal-body:flash", { text: errors.mapBy("message").join("\n"), diff --git a/app/assets/javascripts/discourse/app/components/quote-button.js b/app/assets/javascripts/discourse/app/components/quote-button.js index ac3b3cdceed..86a04d13c73 100644 --- a/app/assets/javascripts/discourse/app/components/quote-button.js +++ b/app/assets/javascripts/discourse/app/components/quote-button.js @@ -403,7 +403,7 @@ export default Component.extend(KeyEnterEscape, { } }); - this?.editPost(postModel); + this.editPost(postModel); afterTransition(document.querySelector("#reply-control"), () => { const textarea = document.querySelector(".d-editor-input"); diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit.js b/app/assets/javascripts/select-kit/addon/components/select-kit.js index 71df384ac26..7330ce0e7b1 100644 --- a/app/assets/javascripts/select-kit/addon/components/select-kit.js +++ b/app/assets/javascripts/select-kit/addon/components/select-kit.js @@ -852,7 +852,7 @@ export default Component.extend( this.clearErrors(); const inModal = this.element.closest("#discourse-modal"); - if (inModal && this?.site?.mobileView) { + if (inModal && this.site.mobileView) { const modalBody = inModal.querySelector(".modal-body"); modalBody.style = ""; } @@ -1061,7 +1061,7 @@ export default Component.extend( handleDeprecations() { this._deprecateValueAttribute(); this._deprecateMutations(); - this._handleDeprecatdArgs(); + this._handleDeprecatedArgs(); }, _computePlacementStrategy() { @@ -1071,7 +1071,7 @@ export default Component.extend( return placementStrategy; } - if (this.capabilities?.isIpadOS || this.site?.mobileView) { + if (this.capabilities.isIpadOS || this.site.mobileView) { placementStrategy = this.selectKit.options.mobilePlacementStrategy || "absolute"; } else { @@ -1160,7 +1160,7 @@ export default Component.extend( return resolvedDeprecations; }, - _handleDeprecatdArgs() { + _handleDeprecatedArgs() { const migrations = { headerIcon: "icon", onExpand: "onOpen", diff --git a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.js b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.js index 79eeb5a7007..60b7ade8782 100644 --- a/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.js +++ b/app/assets/javascripts/select-kit/addon/components/select-kit/select-kit-row.js @@ -38,7 +38,7 @@ export default Component.extend(UtilsMixin, { didInsertElement() { this._super(...arguments); - if (!this?.site?.mobileView) { + if (!this.site.mobileView) { this.element.addEventListener("mouseenter", this.handleMouseEnter); this.element.addEventListener("focus", this.handleMouseEnter); this.element.addEventListener("blur", this.handleBlur); @@ -47,7 +47,8 @@ export default Component.extend(UtilsMixin, { willDestroyElement() { this._super(...arguments); - if (!this?.site?.mobileView && this.element) { + + if (!this.site.mobileView) { this.element.removeEventListener("mouseenter", this.handleBlur); this.element.removeEventListener("focus", this.handleMouseEnter); this.element.removeEventListener("blur", this.handleMouseEnter);