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

FIX: Add check for if element doesnt exist on ensureDropClosed (#13256)

This commit is contained in:
Jordan Vidrine 2021-06-02 13:44:21 -05:00 committed by GitHub
parent 3bb765ac92
commit 188ac1c51f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/discourse/app/components/navigation-bar.js
View File

@ -52,6 +52,10 @@ export default Component.extend(FilterModeMixin, {
}, },
ensureDropClosed() { ensureDropClosed() {
if (!this.element || this.isDestroying || this.isDestroyed) {
return;
}
if (this.expanded) { if (this.expanded) {
this.set("expanded", false); this.set("expanded", false);
} }
@ -75,17 +79,13 @@ export default Component.extend(FilterModeMixin, {
this.element.querySelector(".drop").style.display = "none"; this.element.querySelector(".drop").style.display = "none";
next(() => { next(() => {
if (!this.element || this.isDestroying || this.isDestroyed) { this.ensureDropClosed();
return;
}
this.set("expanded", false);
}); });
return true; return true;
}); });
$(window).on("click.navigation-bar", () => { $(window).on("click.navigation-bar", () => {
this.set("expanded", false); this.ensureDropClosed();
return true; return true;
}); });
}); });