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

Merge pull request #54 from ueokande/fix-53

Browse Source 
Fix 53
jh-changes
Shin'ya Ueoka 7 years ago committed by GitHub
parent f2a42c50d9 4646e8b18d
commit 7ced514f83
4 changed files with 22 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/content/components/content-input.js
  2. 9
      src/content/components/follow.js
  3. 5
      test/content/components/follow.html
  4. 7
      test/content/components/follow.test.js

6
src/content/components/content-input.js
Unescape View File

@ -63,6 +63,10 @@ export default class ContentInputComponent {
fromInput(e) { fromInput(e) {
return e.target instanceof HTMLInputElement || return e.target instanceof HTMLInputElement ||
e.target instanceof HTMLTextAreaElement || e.target instanceof HTMLTextAreaElement ||
e.target instanceof HTMLSelectElement; e.target instanceof HTMLSelectElement ||
e.target instanceof HTMLElement &&
e.target.hasAttribute('contenteditable') && (
e.target.getAttribute('contenteditable').toLowerCase() === 'true' ||
e.target.getAttribute('contenteditable').toLowerCase() === '');
} }
} }

9
src/content/components/follow.js
Unescape View File

@ -4,6 +4,10 @@ import Hint from 'content/hint';
import HintKeyProducer from 'content/hint-key-producer'; import HintKeyProducer from 'content/hint-key-producer';
const DEFAULT_HINT_CHARSET = 'abcdefghijklmnopqrstuvwxyz'; const DEFAULT_HINT_CHARSET = 'abcdefghijklmnopqrstuvwxyz';
const TARGET_SELECTOR = [
'a', 'button', 'input', 'textarea',
'[contenteditable=true]', '[contenteditable=""]'
].join(',');
const inWindow = (window, element) => { const inWindow = (window, element) => {
let { let {
@ -130,6 +134,9 @@ export default class FollowComponent {
return element.focus(); return element.focus();
case 'button': case 'button':
return element.click(); return element.click();
default:
// it may contenteditable
return element.focus();
} }
} }
@ -154,7 +161,7 @@ export default class FollowComponent {
} }
static getTargetElements(doc) { static getTargetElements(doc) {
let all = doc.querySelectorAll('a,button,input,textarea'); let all = doc.querySelectorAll(TARGET_SELECTOR);
let filtered = Array.prototype.filter.call(all, (element) => { let filtered = Array.prototype.filter.call(all, (element) => {
let style = window.getComputedStyle(element); let style = window.getComputedStyle(element);
return style.display !== 'none' && return style.display !== 'none' &&

5
test/content/components/follow.html
Unescape View File

@ -1,9 +1,12 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<body> <body>
<a href='#' >link</a> <a id='visible_a' href='#' >link</a>
<a href='#' style='display:none'>invisible 1</a> <a href='#' style='display:none'>invisible 1</a>
<a href='#' style='visibility:hidden'>invisible 2</a> <a href='#' style='visibility:hidden'>invisible 2</a>
<i>not link<i> <i>not link<i>
<div id='editable_div_1' contenteditable>link</div>
<div id='editable_div_2' contenteditable='true'>link</div>
<div id='x' contenteditable='false'>link</div>
</body> </body>
</html> </html>

7
test/content/components/follow.test.js
Unescape View File

@ -8,8 +8,11 @@ describe('FollowComponent', () => {
}); });
it('returns visible links', () => { it('returns visible links', () => {
let links = FollowComponent.getTargetElements(window.document); let targets = FollowComponent.getTargetElements(window.document);
expect(links).to.have.lengthOf(1); expect(targets).to.have.lengthOf(3);
let ids = Array.prototype.map.call(targets, (e) => e.id);
expect(ids).to.include.members(['visible_a', 'editable_div_1', 'editable_div_2']);
}); });
}); });
}); });