0.9.57

enable auto detect of modal elements only after clicking on some element and disable it on starting to scroll
redyjq · Jan 5, 2020 · 77f21db · 77f21db
1 parent a140195
commit 77f21db
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/content_scripts/hints.js b/content_scripts/hints.js
@@ -602,6 +602,7 @@ function createHints() {
             } else {
                 self.mouseoutLastElement();
                 dispatchMouseEvent(element, behaviours.mouseEvents, shiftKey);
+                Normal.turnOnDOMObserver();
                 lastMouseTarget = element;
             }
         }

diff --git a/content_scripts/normal.js b/content_scripts/normal.js
@@ -406,12 +406,6 @@ function createNormal() {
             event.sk_stopPropagation = true;
         } else if (event.sk_keyName.length) {
             Mode.handleMapKey.call(self, event);
-            if (!DOMObserver.isConnected) {
-                getDocumentBody.then(function(body) {
-                    DOMObserver.observe(body, { childList: true, subtree:true });
-                    DOMObserver.isConnected = true;
-                });
-            }
         }
     });
     self.addEventListener('blur', function(event) {
@@ -734,6 +728,7 @@ function createNormal() {
             default:
                 break;
         }
+        self.turnOffDOMObserver();
     };
 
     self.refreshScrollableElements = function () {
@@ -1211,16 +1206,29 @@ function createNormal() {
         }
     }
 
+    self.turnOnDOMObserver = function() {
+        if (!DOMObserver.isConnected) {
+            getDocumentBody.then(function(body) {
+                DOMObserver.observe(body, { childList: true, subtree:true });
+                DOMObserver.isConnected = true;
+            });
+        }
+    };
+
+    self.turnOffDOMObserver = function() {
+        if (DOMObserver.isConnected) {
+            DOMObserver.disconnect();
+            DOMObserver.isConnected = false;
+        }
+    };
+
     var _disabled = null;
     self.disable = function() {
         if (!_disabled) {
             _disabled = createDisabled();
             _disabled.enter(0, true);
         }
-        if (DOMObserver.isConnected) {
-            DOMObserver.disconnect();
-            DOMObserver.isConnected = false;
-        }
+        self.turnOffDOMObserver();
         document.removeEventListener("mouseup", _onMouseUp);
     };
 
@@ -1234,10 +1242,7 @@ function createNormal() {
     self.enable();
 
     self.onExit = function() {
-        if (DOMObserver.isConnected) {
-            DOMObserver.disconnect();
-            DOMObserver.isConnected = false;
-        }
+        self.turnOffDOMObserver();
         _nodesHasSKScroll.forEach(function(n) {
             delete n.skScrollBy;
             delete n.smoothScrollBy;

diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "Surfingkeys",
     "short_name": "Rich shortcuts in vim spirit for productivity with keyboard.",
-    "version": "0.9.56",
+    "version": "0.9.57",
     "description": "Rich shortcuts to click links/switch tabs/scroll pages or capture full page, use Chrome like vim for productivity.",
     "icons": {
         "16": "icons/16.png",