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

REFACTOR: ensures later is correctly canceled (#9796)

This commit is contained in:
Joffrey JAFFEUX 2020-05-18 14:20:23 +02:00 committed by GitHub
parent 9482ddff73
commit 48ed1b40cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/assets/javascripts/discourse/app/components/edit-category-general.js
View File

@ -1,7 +1,8 @@
import discourseComputed from "discourse-common/utils/decorators";
import { isEmpty } from "@ember/utils";
import { not } from "@ember/object/computed";
import { later } from "@ember/runloop";
import { action } from "@ember/object";
import { later, cancel } from "@ember/runloop";
import { buildCategoryPanel } from "discourse/components/edit-category-panel";
import { categoryBadgeHTML } from "discourse/helpers/category-link";
import Category from "discourse/models/category";
@ -19,6 +20,12 @@ export default buildCategoryPanel("general", {
this._focusCategoryName();
},
willDestroyElement() {
this._super(...arguments);
this._laterFocus && cancel(this._laterFocus);
},
canSelectParentCategory: not("category.isUncategorizedCategory"),
uncategorizedSiteSettingLink: Discourse.getURL(
"/admin/site_settings/category/all_results?filter=allow_uncategorized_topics"
@ -103,19 +110,16 @@ export default buildCategoryPanel("general", {
return !isUncategorizedCategory && categoryId;
},
actions: {
showCategoryTopic() {
window.open(this.get("category.topic_url"), "_blank").focus();
return false;
}
@action
showCategoryTopic() {
window.open(this.get("category.topic_url"), "_blank").focus();
return false;
},
_focusCategoryName() {
later(() => {
if (this.element && !this.isDestroying && !this.isDestroyed) {
const categoryName = this.element.querySelector(".category-name");
categoryName && categoryName.focus();
}
this._laterFocus = later(() => {
const categoryName = this.element.querySelector(".category-name");
categoryName && categoryName.focus();
}, 25);
}
});