Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-08 20:34:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: only respond to menu open swipes on Andorid

Browse Source
This commit is contained in:
Jeff Wong 2019-02-11 20:56:25 -08:00
parent 12d061a45b
commit c3cbff55be
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/discourse/components/site-header.js.es6
View File

@ -228,6 +228,7 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
didInsertElement() { didInsertElement() {
this._super(...arguments); this._super(...arguments);
const { isAndroid } = this.capabilities;
$(window).on("resize.discourse-menu-panel", () => this.afterRender()); $(window).on("resize.discourse-menu-panel", () => this.afterRender());
this.appEvents.on("header:show-topic", topic => this.setTopic(topic)); this.appEvents.on("header:show-topic", topic => this.setTopic(topic));
@ -244,11 +245,16 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
} }
}); });
this.addTouchListeners($("body")); // Only add listeners for opening menus by swiping them in on Android devices
// iOS will respond to these events, but also does swiping for back/forward
if (isAndroid) {
this.addTouchListeners($("body"));
}
}, },
willDestroyElement() { willDestroyElement() {
this._super(...arguments); this._super(...arguments);
const { isAndroid } = this.capabilities;
$("body").off("keydown.header"); $("body").off("keydown.header");
$(window).off("resize.discourse-menu-panel"); $(window).off("resize.discourse-menu-panel");
@ -256,7 +262,9 @@ const SiteHeaderComponent = MountWidget.extend(Docking, PanEvents, {
this.appEvents.off("header:hide-topic"); this.appEvents.off("header:hide-topic");
this.appEvents.off("dom:clean"); this.appEvents.off("dom:clean");
this.removeTouchListeners($("body")); if (isAndroid) {
this.removeTouchListeners($("body"));
}
Ember.run.cancel(this._scheduledRemoveAnimate); Ember.run.cancel(this._scheduledRemoveAnimate);
window.cancelAnimationFrame(this._scheduledMovingAnimation); window.cancelAnimationFrame(this._scheduledMovingAnimation);