From 8a3572ddef883efbc75f2cec9d70fd15140789b3 Mon Sep 17 00:00:00 2001 From: Djamil Legato Date: Fri, 15 Jul 2016 16:15:05 -0700 Subject: [PATCH] Fixed issue with Offcanvas that on Touch devices would cause the Offcanvas to close while touch-scrolling (fixes #1447) --- CHANGELOG.md | 1 + assets/common/application/menu/index.js | 2 +- assets/common/js/main.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f15e8917..cc005a11d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ - Proper fix for nested fields within containers (#924, #1026) - Fixed `Undefined property: stdClass::$outline` in `Layout::inherit()` - Fixed issue with modals in Firefox where the bottom end wouldn't have enough margin (thanks @coder4life - #1454) + - Fixed issue with Offcanvas that on Touch devices would cause the Offcanvas to close while touch-scrolling (#1447) 2. [Joomla](#joomla) 1. [](#new) - Allow to install and update Gantry in Joomla 3.6 diff --git a/assets/common/application/menu/index.js b/assets/common/application/menu/index.js index f7c15dfb6..c512e10c4 100644 --- a/assets/common/application/menu/index.js +++ b/assets/common/application/menu/index.js @@ -74,7 +74,7 @@ var Menu = new prime({ } body.delegate('click', ':not(' + selectors.mainContainer + ') ' + selectors.linkedParent + ', .g-fullwidth .g-sublevel ' + selectors.linkedParent, this.bound('click')); - body.delegate(hasTouchEvents ? 'touchend' : 'click', ':not(' + selectors.mainContainer + ') a[href]', this.bound('resetAfterClick')); + body.delegate('click', ':not(' + selectors.mainContainer + ') a[href]', this.bound('resetAfterClick')); if (hasTouchEvents || !this.hoverExpand) { var linkedParent = $(selectors.linkedParent); diff --git a/assets/common/js/main.js b/assets/common/js/main.js index fd051f0a3..8f44a811a 100644 --- a/assets/common/js/main.js +++ b/assets/common/js/main.js @@ -100,7 +100,7 @@ var Menu = new prime({ } body.delegate('click', ':not(' + selectors.mainContainer + ') ' + selectors.linkedParent + ', .g-fullwidth .g-sublevel ' + selectors.linkedParent, this.bound('click')); - body.delegate(hasTouchEvents ? 'touchend' : 'click', ':not(' + selectors.mainContainer + ') a[href]', this.bound('resetAfterClick')); + body.delegate('click', ':not(' + selectors.mainContainer + ') a[href]', this.bound('resetAfterClick')); if (hasTouchEvents || !this.hoverExpand) { var linkedParent = $(selectors.linkedParent);