Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes to fix touchscreen issues when tapping on top-level nav items. #53

Open
wants to merge 3 commits into
base: gh-pages
Choose a base branch
from
Open

Changes to fix touchscreen issues when tapping on top-level nav items. #53

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e366dc
Changes to fix touchscreen issues when tapping on top-level nav items.
tanu08 Mar 11, 2018
c1bd3ba
Changes to fix safari menu panels not opening and click inconsistenci…
tanu08 Mar 19, 2018
c188aa5
Fixed scrollbar issue on smaller screen sizes, when clicking on anoth…
tanu08 Mar 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 43 additions & 30 deletions js/jquery-accessibleMegaMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,8 @@ limitations under the License.
_mouseDownHandler,
_mouseOverHandler,
_mouseOutHandler,
_toggleExpandedEventHandlers;
_toggleExpandedEventHandlers,
_setTopNavHeight;

/**
* @name jQuery.fn.accessibleMegaMenu~_getPlugin
Expand Down Expand Up @@ -268,6 +269,14 @@ limitations under the License.
.addClass(settings.openClass)
.filter('.' + settings.panelClass)
.attr('aria-hidden', 'false');

var pageScrollPosition = $('html')[0].scrollTop;
var openPanelTopPosition = $('.' + settings.panelClass + '.' + settings.openClass).parent().offset().top;

if(pageScrollPosition > openPanelTopPosition) {
$('html')[0].scrollTop = openPanelTopPosition;
}

if (event.type === 'mouseover' && target.is(':tabbable') && topli.length === 1 && panel.length === 0 && menu.has(document.activeElement).length > 0) {
target.focus();
that.justFocused = false;
Expand Down Expand Up @@ -302,10 +311,10 @@ limitations under the License.
event.preventDefault();
event.stopPropagation();
this.justFocused = false;
} else if (isTouch) {
} else {
event.preventDefault();
event.stopPropagation();
_togglePanel.call(this, event, target.hasClass(this.settings.openClass));
_togglePanel.call(this, event, true);
}
}
}
Expand Down Expand Up @@ -357,14 +366,9 @@ limitations under the License.
clearTimeout(this.focusTimeoutID);
var target = $(event.target),
panel = target.closest('.' + this.settings.panelClass);
target
.addClass(this.settings.focusClass)
.on('click.accessible-megamenu', $.proxy(_clickHandler, this));
target.addClass(this.settings.focusClass).on('click.accessible-megamenu', $.proxy(_mouseDownHandler, this));
this.justFocused = !this.mouseFocused;
this.mouseFocused = false;
if (this.panels.not(panel).filter('.' + this.settings.openClass).length) {
_togglePanel.call(this, event);
}
};

/**
Expand All @@ -381,10 +385,7 @@ limitations under the License.
target = $(event.target),
topli = target.closest('.' + this.settings.topNavItemClass),
keepOpen = false;
target
.removeClass(this.settings.focusClass)
.off('click.accessible-megamenu');

target.removeClass(this.settings.focusClass).off('click.accessible-megamenu');
if (window.cvox) {
// If ChromeVox is running...
that.focusTimeoutID = setTimeout(function () {
Expand Down Expand Up @@ -555,13 +556,18 @@ limitations under the License.
case Keyboard.SPACE:
if (isTopNavItem) {
event.preventDefault();
_clickHandler.call(that, event);
_mouseDownHandler.call(that, event);
} else {
return true;
}
break;
case Keyboard.ENTER:
return true;
if (isTopNavItem) {
event.preventDefault();
_mouseDownHandler.call(that, event);
} else {
return true;
}
break;
default:
// alphanumeric filter
Expand Down Expand Up @@ -634,7 +640,9 @@ limitations under the License.
if ($(event.target).is(this.settings.panelClass) || $(event.target).closest(":focusable").length) {
this.mouseFocused = true;
}
clearTimeout(this.mouseTimeoutID);

_clickHandler.call(this, event);

this.mouseTimeoutID = setTimeout(function () {
clearTimeout(this.focusTimeoutID);
}, 1);
Expand All @@ -650,14 +658,11 @@ limitations under the License.
*/
_mouseOverHandler = function (event) {
clearTimeout(this.mouseTimeoutID);
var that = this;
this.mouseTimeoutID = setTimeout(function () {
$(event.target).addClass(that.settings.hoverClass);
_togglePanel.call(that, event);
if ($(event.target).is(':tabbable')) {
$('html').on('keydown.accessible-megamenu', $.proxy(_keyDownHandler, event.target));
}
}, this.settings.openDelay);
$(event.target)
.addClass(this.settings.hoverClass);
if ($(event.target).is(':tabbable')) {
$('html').on('keydown.accessible-megamenu', $.proxy(_keyDownHandler, event.target));
}
};

/**
Expand All @@ -669,14 +674,10 @@ limitations under the License.
* @private
*/
_mouseOutHandler = function (event) {
clearTimeout(this.mouseTimeoutID);
var that = this;
$(event.target)
.removeClass(that.settings.hoverClass);

that.mouseTimeoutID = setTimeout(function () {
_togglePanel.call(that, event, true);
}, 250);
if ($(event.target).is(':tabbable')) {
$('html').off('keydown.accessible-megamenu');
}
Expand All @@ -697,6 +698,17 @@ limitations under the License.
}
};

_setTopNavHeight = function() {
var topNavHeight = 0;
var $menuItems = $('.' + this.settings.topNavItemClass + ', .' + this.settings.topNavItemClass + ' > a, .' + this.settings.menuClass);
$menuItems.css('height', 'auto');
$('.' + this.settings.topNavItemClass + ' > a').each( function() {
topNavHeight = ( $(this).outerHeight() > topNavHeight ) ? $(this).outerHeight() : topNavHeight;
});
$menuItems.css('height', topNavHeight);
$("." + this.settings.menuClass + " ." + this.settings.panelClass).css('top', topNavHeight);
};

/* public attributes and methods ------------------------- */
return {
constructor: AccessibleMegaMenu,
Expand Down Expand Up @@ -733,13 +745,13 @@ limitations under the License.
if (topnavitempanel.length) {
_addUniqueId.call(that, topnavitempanel);
topnavitemlink.attr({
// "aria-haspopup": true,
"aria-haspopup": true,
"aria-controls": topnavitempanel.attr("id"),
"aria-expanded": false
});

topnavitempanel.attr({
"role": "region",
"role": "group",
"aria-expanded": false,
"aria-hidden": true
})
Expand Down Expand Up @@ -1065,4 +1077,5 @@ limitations under the License.
return (isTabIndexNaN || tabIndex >= 0) && focusable(element, !isTabIndexNaN);
}
});

}(jQuery, window, document));