From ae70a23525fb8c44776bad2368bb0f33d8a10544 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Thu, 25 Feb 2021 23:41:12 +0530
Subject: [PATCH] FIX: ignore enter key press on "move to existing post" search
field (#12210)
UX: do not set focus on auto-selected radio option
---
.../discourse/app/components/choose-topic.js | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/app/assets/javascripts/discourse/app/components/choose-topic.js b/app/assets/javascripts/discourse/app/components/choose-topic.js
index d69861281cd..4ff2faa283f 100644
--- a/app/assets/javascripts/discourse/app/components/choose-topic.js
+++ b/app/assets/javascripts/discourse/app/components/choose-topic.js
@@ -2,7 +2,7 @@ import discourseComputed, { observes } from "discourse-common/utils/decorators";
import Component from "@ember/component";
import discourseDebounce from "discourse-common/lib/debounce";
import { isEmpty } from "@ember/utils";
-import { next } from "@ember/runloop";
+import { next, schedule } from "@ember/runloop";
import { searchForTerm } from "discourse/lib/search";
export default Component.extend({
@@ -39,6 +39,22 @@ export default Component.extend({
}
},
+ didInsertElement() {
+ this._super(...arguments);
+ schedule("afterRender", () => {
+ $("#choose-topic-title").keydown((e) => {
+ if (e.keyCode === 13) {
+ return false;
+ }
+ });
+ });
+ },
+
+ willDestroyElement() {
+ this._super(...arguments);
+ $("#choose-topic-title").off("keydown");
+ },
+
@observes("topicTitle")
topicTitleChanged() {
this.setProperties({
@@ -113,7 +129,6 @@ export default Component.extend({
this.set("selectedTopicId", topic.id);
next(() => {
document.getElementById(`choose-topic-${topic.id}`).checked = true;
- document.getElementById(`choose-topic-${topic.id}`).focus();
});
if (this.topicChangedCallback) {
this.topicChangedCallback(topic);