Correctly synchronize icon and active state

Three situations are considered:
1. Active tab is disabled -> disable icon
2. Active tab is enabled and should be enabled -> enable icon
3. Active tab is enabled but should be disabled -> disable icon and disable vimium

1 files changed, 5 insertions, 0 deletions

diff --git a/vimiumFrontend.js b/vimiumFrontend.js
index 80a9dd3b..f0808541 100644
--- a/vimiumFrontend.js
+++ b/vimiumFrontend.js
@@ -177,6 +177,10 @@ function initializePreDomReady() {
       port.onMessage.addListener(function (args) {
         refreshCompletionKeys(args.completionKeys);
       });
+    } else if (port.name == "getActiveState") {
+      port.onMessage.addListener(function(args) {
+        port.postMessage({ enabled: isEnabledForUrl });
+      });
     } else if (port.name == "disableVimium") {
       port.onMessage.addListener(function(args) {
         disableVimium();
@@ -205,6 +209,7 @@ function disableVimium() {
   document.removeEventListener("focus", onFocusCapturePhase, true);
   document.removeEventListener("blur", onBlurCapturePhase, true);
   document.removeEventListener("DOMActivate", onDOMActivate, true);
+  isEnabledForUrl = false;
 }
 
 /*