Merge pull request #54 from ueokande/fix-53

Fix 53

2 files changed, 13 insertions, 2 deletions

diff --git a/src/content/components/content-input.js b/src/content/components/content-input.js
index 0ba4bcb..3e70bbb 100644
--- a/src/content/components/content-input.js
+++ b/src/content/components/content-input.js
@@ -63,6 +63,10 @@ export default class ContentInputComponent {
   fromInput(e) {
     return e.target instanceof HTMLInputElement ||
       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() === '');
   }
 }
diff --git a/src/content/components/follow.js b/src/content/components/follow.js
index c87424d..eb453a5 100644
--- a/src/content/components/follow.js
+++ b/src/content/components/follow.js
@@ -4,6 +4,10 @@ import Hint from 'content/hint';
 import HintKeyProducer from 'content/hint-key-producer';
 
 const DEFAULT_HINT_CHARSET = 'abcdefghijklmnopqrstuvwxyz';
+const TARGET_SELECTOR = [
+  'a', 'button', 'input', 'textarea',
+  '[contenteditable=true]', '[contenteditable=""]'
+].join(',');
 
 const inWindow = (window, element) => {
   let {
@@ -130,6 +134,9 @@ export default class FollowComponent {
       return element.focus();
     case 'button':
       return element.click();
+    default:
+      // it may contenteditable
+      return element.focus();
     }
   }
 
@@ -154,7 +161,7 @@ export default class FollowComponent {
   }
 
   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 style = window.getComputedStyle(element);
       return style.display !== 'none' &&