jab2870/Vim-Vixen
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into background-adjacent-tabs

Browse source
This commit is contained in:
Shin'ya Ueoka 2018-05-01 13:51:07 +09:00
commit 4d7c24f38a
120 changed files with 14625 additions and 1641 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/content/components/common/follow.js
View file

@ -4,7 +4,8 @@ import * as dom from 'shared/utils/dom';
const TARGET_SELECTOR = [
'a', 'button', 'input', 'textarea', 'area',
'[contenteditable=true]', '[contenteditable=""]', '[tabindex]'
'[contenteditable=true]', '[contenteditable=""]', '[tabindex]',
'[role="button"]'
].join(',');
@ -29,6 +30,21 @@ const inViewport = (win, element, viewSize, framePosition) => {
return true;
};
const isAriaHiddenOrAriaDisabled = (win, element) => {
if (!element || win.document.documentElement === element) {
return false;
}
for (let attr of ['aria-hidden', 'aria-disabled']) {
if (element.hasAttribute(attr)) {
let hidden = element.getAttribute(attr).toLowerCase();
if (hidden === '' || hidden === 'true') {
return true;
}
}
}
return isAriaHiddenOrAriaDisabled(win, element.parentNode);
};
export default class Follow {
constructor(win, store) {
this.win = win;
@ -48,6 +64,7 @@ export default class Follow {
this.win.parent.postMessage(JSON.stringify({
type: messages.FOLLOW_KEY_PRESS,
key: key.key,
ctrlKey: key.ctrlKey,
}), '*');
return true;
}
@ -174,6 +191,7 @@ export default class Follow {
style.visibility !== 'hidden' &&
element.type !== 'hidden' &&
element.offsetHeight > 0 &&
!isAriaHiddenOrAriaDisabled(win, element) &&
inViewport(win, element, viewSize, framePosition);
});
return filtered;