5 files changed, 27 insertions, 27 deletions

diff --git a/src/content/components/common/follow.js b/src/content/components/common/follow.js
index 4eeaaa2..83aeb0a 100644
--- a/src/content/components/common/follow.js
+++ b/src/content/components/common/follow.js
@@ -3,17 +3,18 @@ import Hint from './hint';
 import * as dom from 'shared/utils/dom';
 
 const TARGET_SELECTOR = [
-  'a', 'button', 'input', 'textarea',
+  'a', 'button', 'input', 'textarea', 'area',
   '[contenteditable=true]', '[contenteditable=""]', '[tabindex]'
 ].join(',');
 
+
 const inViewport = (win, element, viewSize, framePosition) => {
   let {
     top, left, bottom, right
-  } = element.getBoundingClientRect();
-  let doc = win.doc;
-  let frameWidth = win.innerWidth || doc.documentElement.clientWidth;
-  let frameHeight = win.innerHeight || doc.documentElement.clientHeight;
+  } = dom.viewportRect(element);
+  let doc = win.document;
+  let frameWidth = doc.documentElement.clientWidth;
+  let frameHeight = doc.documentElement.clientHeight;
 
   if (right < 0 || bottom < 0 || top > frameHeight || left > frameWidth) {
     // out of frame
@@ -39,9 +40,6 @@ export default class Follow {
     messages.onMessage(this.onMessage.bind(this));
   }
 
-  update() {
-  }
-
   key(key) {
     if (Object.keys(this.hints).length === 0) {
       return false;
@@ -118,6 +116,7 @@ export default class Follow {
     let element = hint.target;
     switch (element.tagName.toLowerCase()) {
     case 'a':
+    case 'area':
       return this.openLink(element);
     case 'input':
       switch (element.type) {
@@ -165,7 +164,9 @@ export default class Follow {
     let all = win.document.querySelectorAll(TARGET_SELECTOR);
     let filtered = Array.prototype.filter.call(all, (element) => {
       let style = win.getComputedStyle(element);
-      return style.display !== 'none' &&
+
+      // AREA's 'display' in Browser style is 'none'
+      return (element.tagName === 'AREA' || style.display !== 'none') &&
         style.visibility !== 'hidden' &&
         element.type !== 'hidden' &&
         element.offsetHeight > 0 &&
diff --git a/src/content/components/common/hint.js b/src/content/components/common/hint.js
index cc46fd6..9ef9eba 100644
--- a/src/content/components/common/hint.js
+++ b/src/content/components/common/hint.js
@@ -1,4 +1,18 @@
 import './hint.css';
+import * as dom from 'shared/utils/dom';
+
+const hintPosition = (element) => {
+  let { left, top, right, bottom } = dom.viewportRect(element);
+
+  if (element.tagName !== 'AREA') {
+    return { x: left, y: top };
+  }
+
+  return {
+    x: (left + right) / 2,
+    y: (top + bottom) / 2,
+  };
+};
 
 export default class Hint {
   constructor(target, tag) {
@@ -9,14 +23,14 @@ export default class Hint {
     this.target = target;
 
     let doc = target.ownerDocument;
-    let { top, left } = target.getBoundingClientRect();
+    let { x, y } = hintPosition(target);
     let { scrollX, scrollY } = window;
 
     this.element = doc.createElement('span');
     this.element.className = 'vimvixen-hint';
     this.element.textContent = tag;
-    this.element.style.left = left + scrollX + 'px';
-    this.element.style.top = top + scrollY + 'px';
+    this.element.style.left = x + scrollX + 'px';
+    this.element.style.top = y + scrollY + 'px';
 
     this.show();
     doc.body.append(this.element);
diff --git a/src/content/components/common/index.js b/src/content/components/common/index.js
index 5f5531b..4c2c1df 100644
--- a/src/content/components/common/index.js
+++ b/src/content/components/common/index.js
@@ -14,21 +14,12 @@ export default class Common {
     input.onKey(key => keymapper.key(key));
 
     this.store = store;
-    this.children = [
-      follow,
-      input,
-      keymapper,
-    ];
 
     this.reloadSettings();
 
     messages.onMessage(this.onMessage.bind(this));
   }
 
-  update() {
-    this.children.forEach(c => c.update());
-  }
-
   onMessage(message) {
     switch (message.type) {
     case messages.SETTINGS_CHANGED:
diff --git a/src/content/components/common/input.js b/src/content/components/common/input.js
index ef5af29..8b1d35d 100644
--- a/src/content/components/common/input.js
+++ b/src/content/components/common/input.js
@@ -28,9 +28,6 @@ export default class InputComponent {
     target.addEventListener('keyup', this.onKeyUp.bind(this));
   }
 
-  update() {
-  }
-
   onKey(cb) {
     this.onKeyListeners.push(cb);
   }
diff --git a/src/content/components/common/keymapper.js b/src/content/components/common/keymapper.js
index 44d8212..1da3c0d 100644
--- a/src/content/components/common/keymapper.js
+++ b/src/content/components/common/keymapper.js
@@ -7,9 +7,6 @@ export default class KeymapperComponent {
     this.store = store;
   }
 
-  update() {
-  }
-
   key(key) {
     this.store.dispatch(inputActions.keyPress(key));