Merge pull request philc#1211 from mrmr1993/blur-embeds-with-options

Allow blur of embedded objects (e.g. flash) and add an option to enable/disable it

Conflicts:
	content_scripts/vimium_frontend.coffee

Author: mrmr1993

background_scripts/settings.coffee

@@ -66,6 +66,7 @@ root.Settings = Settings =
     linkHintNumbers: "0123456789"
     filterLinkHints: false
     hideHud: false
+    enableBlurEmbeds: false
     userDefinedLinkHintCss:
       """
       div > .vimiumHintMarker {

content_scripts/vimium_frontend.coffee

@@ -51,7 +51,7 @@ settings =
   loadedValues: 0
   valuesToLoad: ["scrollStepSize", "linkHintCharacters", "linkHintNumbers", "filterLinkHints", "hideHud",
     "previousPatterns", "nextPatterns", "findModeRawQuery", "regexFindMode", "userDefinedLinkHintCss",
-    "helpDialog_showAdvancedCommands"]
+    "helpDialog_showAdvancedCommands", "enableBlurEmbeds"]
   isLoaded: false
   eventListeners: {}
 
@@ -423,11 +423,11 @@ onKeydown = (event) ->
 
   if (isInsertMode() and
       (insertExitKeys.indexOf(rawKeyChar) != -1 or isInsertExitPassKey))
-    # We don't want to programmatically blur out of Flash embeds from Javascript.
-    if (!isEmbed(event.srcElement))
+    # Blurring out of embeds could be dangerous, do nothing unless the user explicitly enables it.
+    if (!isEmbed(event.srcElement) or settings.get "enableBlurEmbeds")
       # Remove focus so the user can't just get himself back into insert mode by typing in the same input
       # box.
-      if (isEditable(event.srcElement))
+      if (isEditable(event.srcElement) or isEmbed(event.srcElement))
         event.srcElement.blur()
       exitInsertMode()
       unless isInsertExitPassKey

pages/options.coffee

@@ -194,6 +194,7 @@ document.addEventListener "DOMContentLoaded", ->
     newTabUrl: NonEmptyTextOption
     nextPatterns: NonEmptyTextOption
     previousPatterns: NonEmptyTextOption
+    enableBlurEmbeds: CheckBoxOption
     regexFindMode: CheckBoxOption
     scrollStepSize: NumberOption
     searchEngines: TextOption

pages/options.html

@@ -345,6 +345,20 @@
               </label>
             </td>
           </tr>
+          <tr>
+            <td class="caption"></td>
+            <td verticalAlign="top" class="booleanOption">
+              <div class="help">
+                <div class="example">
+                  This is an experimental option, and could break embeds that expect to handle the escape key.
+                </div>
+              </div>
+              <label>
+                <input id="enableBlurEmbeds" type="checkbox"/>
+                Enable blurring embed elements to exit insert mode.
+              </label>
+            </td>
+          </tr>
           <tr>
             <td class="caption"></td>
             <td verticalAlign="top" class="booleanOption">