From d6aadf60bd395638c22b2977179793ea6776b68b Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Wed, 20 Jan 2021 15:02:27 +0100 Subject: [PATCH] FIX: Don't try to focus on a missing element (#11766) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replacing 3 imports and flawed fragile logic with a single html attribute 💆 --- .../admin/addon/components/embeddable-host.js | 14 +------------- .../addon/templates/components/embeddable-host.hbs | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/admin/addon/components/embeddable-host.js b/app/assets/javascripts/admin/addon/components/embeddable-host.js index a3213e7c942..a0f546227b9 100644 --- a/app/assets/javascripts/admin/addon/components/embeddable-host.js +++ b/app/assets/javascripts/admin/addon/components/embeddable-host.js @@ -1,16 +1,12 @@ -import discourseComputed, { - observes, - on, -} from "discourse-common/utils/decorators"; import Category from "discourse/models/category"; import Component from "@ember/component"; import I18n from "I18n"; import bootbox from "bootbox"; import { bufferedProperty } from "discourse/mixins/buffered-content"; +import discourseComputed from "discourse-common/utils/decorators"; import { isEmpty } from "@ember/utils"; import { or } from "@ember/object/computed"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import { schedule } from "@ember/runloop"; export default Component.extend(bufferedProperty("host"), { editToggled: false, @@ -19,14 +15,6 @@ export default Component.extend(bufferedProperty("host"), { editing: or("host.isNew", "editToggled"), - @on("didInsertElement") - @observes("editing") - _focusOnInput() { - schedule("afterRender", () => { - this.element.querySelector(".host-name").focus(); - }); - }, - @discourseComputed("buffered.host", "host.isSaving") cantSave(host, isSaving) { return isSaving || isEmpty(host); diff --git a/app/assets/javascripts/admin/addon/templates/components/embeddable-host.hbs b/app/assets/javascripts/admin/addon/templates/components/embeddable-host.hbs index 7d73d93a2b3..db8d1083089 100644 --- a/app/assets/javascripts/admin/addon/templates/components/embeddable-host.hbs +++ b/app/assets/javascripts/admin/addon/templates/components/embeddable-host.hbs @@ -1,7 +1,7 @@ {{#if editing}}
{{i18n "admin.embedding.host"}}
- {{input value=buffered.host placeholder="example.com" enter=(action "save") class="host-name"}} + {{input value=buffered.host placeholder="example.com" enter=(action "save") class="host-name" autofocus=true}}
{{i18n "admin.embedding.class_name"}}