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

FIX: prevents mobile nav to create an error when unregistering click events (#8016) 

This what happening when clickin on "All groups", as it was trying to get element of a destroying component.
This commit is contained in:
Joffrey JAFFEUX 2019-08-19 09:33:54 +02:00 committed by GitHub
parent 47638ffea4
commit 1a731dcff1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/discourse/components/mobile-nav.js.es6
View File

@ -4,7 +4,7 @@ export default Ember.Component.extend({
@on("init") @on("init")
_init() { _init() {
if (!this.get("site.mobileView")) { if (!this.get("site.mobileView")) {
var classes = this.desktopClass; let classes = this.desktopClass;
if (classes) { if (classes) {
classes = classes.split(" "); classes = classes.split(" ");
this.set("classNames", classes); this.set("classNames", classes);
@ -31,6 +31,8 @@ export default Ember.Component.extend({
}, },
didInsertElement() { didInsertElement() {
this._super(...arguments);
this._updateSelectedHtml(); this._updateSelectedHtml();
}, },
@ -43,9 +45,12 @@ export default Ember.Component.extend({
$(window) $(window)
.off("click.mobile-nav") .off("click.mobile-nav")
.on("click.mobile-nav", e => { .on("click.mobile-nav", e => {
let expander = $(this.element.querySelector(".expander")); if (!this.element || this.isDestroying || this.isDestroyed) {
expander = expander && expander[0]; return;
if ($(e.target)[0] !== expander) { }
const expander = this.element.querySelector(".expander");
if (expander && e.target !== expander) {
this.set("expanded", false); this.set("expanded", false);
$(window).off("click.mobile-nav"); $(window).off("click.mobile-nav");
} }