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

DEV: Make DTooltipInstance destroy synchronous (#24439) 

Having async cleanup on a modifier is problematic because it means it might persist beyond the end of a test, leading to flaky 'Test is not isolated' errors.
This commit is contained in:
David Taylor 2023-11-20 13:27:44 +00:00 committed by GitHub
parent 9d8abcbdfe
commit 0a58564ddd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/float-kit/addon/lib/d-tooltip-instance.js
View File

@ -56,8 +56,8 @@ export default class DTooltipInstance extends FloatKitInstance {
} }
@action @action
async destroy() { destroy() {
await this.close(); this.close();
this.tearDownListeners(); this.tearDownListeners();
} }
} }

10
app/assets/javascripts/float-kit/addon/lib/float-kit-instance.js
View File

@ -1,6 +1,6 @@
import { tracked } from "@glimmer/tracking"; import { tracked } from "@glimmer/tracking";
import { action } from "@ember/object"; import { action } from "@ember/object";
import { cancel, next } from "@ember/runloop"; import { cancel } from "@ember/runloop";
import { makeArray } from "discourse-common/lib/helpers"; import { makeArray } from "discourse-common/lib/helpers";
import discourseLater from "discourse-common/lib/later"; import discourseLater from "discourse-common/lib/later";
import { bind } from "discourse-common/utils/decorators"; import { bind } from "discourse-common/utils/decorators";
@ -20,17 +20,13 @@ export default class FloatKitInstance {
content = null; content = null;
@action @action
async show() { show() {
this.expanded = true; this.expanded = true;
await new Promise((resolve) => next(resolve));
} }
@action @action
async close() { close() {
this.expanded = false; this.expanded = false;
await new Promise((resolve) => next(resolve));
} }
@action @action