From fee33fa8e30587d0c68f4c86171dab098dd9db86 Mon Sep 17 00:00:00 2001
From: Simon Lydell <simon.lydell@gmail.com>
Date: Fri, 20 May 2016 17:35:35 +0200
Subject: [PATCH] Improve focusType detection

Inputs focused and blurred inside the Evernote Web Clipper extension's
popup (which is an `<iframe>` injected into the browser UI) were
previously not detected (making it difficult to type into them without
triggering VimFx commands). That was because we have to check if events
really are UI events or not in order to support non-multi-process
Firefox (which expose web page content events to UI code), and
Evernote's elements seem to be indistinguishable from web page content.

This commit simply removes the check for where the event comes from when
looking for focusType changes. Luckily, it doesn't matter if we happen
to handle web page content events in the UI.

To avoid excessive 'focusTypeChange' events (a single focus or blur
might trigger 'focusTypeChange' twice now: Once in the UI code, and once
in the frame script), this commit also makes sure that setting the
focusType to the same value as before is a no-op.

Fixes #733.
---
 extension/lib/events.coffee | 18 ++++++++++++------
 extension/lib/vim.coffee    |  4 +++-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/extension/lib/events.coffee b/extension/lib/events.coffee
index 749b110..a45196b 100644
--- a/extension/lib/events.coffee
+++ b/extension/lib/events.coffee
@@ -101,12 +101,18 @@ class UIEventManager
     handleFocusRelatedEvent = (event) =>
       return unless vim = @vimfx.getCurrentVim(@window)
 
-      if vim.isUIEvent(event)
-        focusType = utils.getFocusType(utils.getActiveElement(@window))
-        vim._setFocusType(focusType)
-
-        if focusType == 'editable' and vim.mode == 'caret'
-          vim.enterMode('normal')
+      # We used to only continue if `vim.isUIEvent(event)` here, but that’s not
+      # entirely reliable. Elements focused and blurred inside the Evernote Web
+      # Clipper extension’s popup (which is an `<iframe>` injected into the
+      # browser UI) _are_ UI elements, but seem to be indistinguishable from
+      # non-UI elements. Luckily, it doesn’t matter if we happen to handle
+      # non-UI elements when determining the focus type. TODO: Remove this
+      # comment when non-multi-process is removed from Firefox.
+      focusType = utils.getFocusType(utils.getActiveElement(@window))
+      vim._setFocusType(focusType)
+
+      if focusType == 'editable' and vim.mode == 'caret'
+        vim.enterMode('normal')
 
     @listen('focus', handleFocusRelatedEvent)
     @listen('blur', (event) =>
diff --git a/extension/lib/vim.coffee b/extension/lib/vim.coffee
index 7aa31b8..e04e652 100644
--- a/extension/lib/vim.coffee
+++ b/extension/lib/vim.coffee
@@ -179,7 +179,9 @@ class Vim
     @browser.focus()
     @_run('focus_marker_element', {elementIndex, options})
 
-  _setFocusType: (@focusType) ->
+  _setFocusType: (focusType) ->
+    return if focusType == @focusType
+    @focusType = focusType
     switch
       when @focusType == 'ignore'
         @enterMode('ignore', {type: 'focusType'})
-- 
2.39.3