Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.
Merged
Changes from all commits
Commits
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
42 changes: 26 additions & 16 deletions src/core/services/gesture/gesture.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,20 +104,9 @@ function MdGesture($$MdGestureHandler, $$rAF, $timeout) {
maxDistance: maxClickDistance
},
onEnd: function(ev, pointer) {
if (pointer.distance < this.state.options.maxDistance) {
if (canFocus(ev.target)) {
this.dispatchEvent(ev, 'focus', pointer);
ev.target.focus();
}
}

function canFocus(element) {
var focusableElements = ['INPUT', 'SELECT', 'BUTTON', 'TEXTAREA', 'VIDEO', 'AUDIO'];

return (element.getAttribute('tabindex') != '-1') &&
!element.hasAttribute('DISABLED') &&
(element.hasAttribute('tabindex') || element.hasAttribute('href') || element.isContentEditable ||
(focusableElements.indexOf(element.nodeName) != -1));
if (pointer.distance < this.state.options.maxDistance && canFocus(ev.target)) {
this.dispatchEvent(ev, 'focus', pointer);
ev.target.focus();
}
}
});
Expand Down Expand Up @@ -550,8 +539,14 @@ function attachToDocument( $mdGesture, $$MdGestureHandler ) {

function mouseInputHijacker(ev) {
var isKeyClick = !ev.clientX && !ev.clientY;
if (!isKeyClick && !ev.$material && !ev.isIonicTap
&& !isInputEventFromLabelClick(ev)) {

if (
!isKeyClick &&
!ev.$material &&
!ev.isIonicTap &&
!isInputEventFromLabelClick(ev) &&
(ev.type !== 'mousedown' || (!canFocus(ev.target) && !canFocus(document.activeElement)))
) {
ev.preventDefault();
ev.stopPropagation();
}
Expand Down Expand Up @@ -745,3 +740,18 @@ function getEventPoint(ev) {
(ev.changedTouches && ev.changedTouches[0]) ||
ev;
}

/** Checks whether an element can be focused. */
function canFocus(element) {
return (
!!element &&
element.getAttribute('tabindex') != '-1' &&
!element.hasAttribute('disabled') &&
(
element.hasAttribute('tabindex') ||
element.hasAttribute('href') ||
element.isContentEditable ||
['INPUT', 'SELECT', 'BUTTON', 'TEXTAREA', 'VIDEO', 'AUDIO'].indexOf(element.nodeName) != -1
)
);
}