Revert "Make <ESC> do defocusing."

This reverts commit b8789c56b0ee96ee1eca75291028017c4f9d89cc.

See discussion at #426.

Conflicts:

	vimiumFrontend.js

2 files changed, 0 insertions, 18 deletions

diff --git a/background_page.html b/background_page.html
index 8f7a0b74..90c628dc 100644
--- a/background_page.html
+++ b/background_page.html
@@ -38,7 +38,6 @@
     openOptionsPageInNewTab: openOptionsPageInNewTab,
     registerFrame: registerFrame,
     frameFocused: handleFrameFocused,
-    focusTopFrame: focusTopFrame,
     upgradeNotificationClosed: upgradeNotificationClosed,
     updateScrollPosition: handleUpdateScrollPosition,
     copyToClipboard: copyToClipboard,
@@ -629,7 +628,6 @@
 
     if (request.is_top) {
       focusedFrame = request.frameId;
-      framesForTab[sender.tab.id].topId = request.frameId;
       framesForTab[sender.tab.id].total = request.total;
     }
 
@@ -657,11 +655,6 @@
     chrome.tabs.sendRequest(tabId, { name: "focusFrame", frameId: mainFrameId, highlight: false });
   }
 
-  function focusTopFrame(request, sender) {
-    var tabId = sender.tab.id;
-    chrome.tabs.sendRequest(tabId, { name: "focusFrame", frameId: framesForTab[tabId].topId, highlight: true });
-  }
-
   function handleFrameFocused(request, sender) {
     focusedFrame = request.frameId;
   }
diff --git a/vimiumFrontend.js b/vimiumFrontend.js
index 66e96d49..f62e450f 100644
--- a/vimiumFrontend.js
+++ b/vimiumFrontend.js
@@ -517,8 +517,6 @@ function onKeydown(event) {
     }
     else if (isEscape(event)) {
       keyPort.postMessage({keyChar:"<ESC>", frameId:frameId});
-      handleEscapeForNormalMode();
-      suppressEvent(event);
     }
   }
 
@@ -1003,15 +1001,6 @@ function hideHelpDialog(clickEvent) {
     clickEvent.preventDefault();
 }
 
-// do our best to return the document to its 'default' state.
-function handleEscapeForNormalMode() {
-  window.getSelection().collapse();
-  if (document.activeElement !== document.body)
-    document.activeElement.blur();
-  else if (window.top !== window.self)
-    chrome.extension.sendRequest({ handler: "focusTopFrame" });
-}
-
 /*
  * A heads-up-display (HUD) for showing Vimium page operations.
  * Note: you cannot interact with the HUD until document.body is available.