use synchronous highlight, async scroll markers

neaumusic · Nov 6, 2020 · 557dad8 · 557dad8
1 parent 9310076
commit 557dad8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 22 deletions.
diff --git a/src/chrome_extension/manifest.json b/src/chrome_extension/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Selection Highlighter",
-  "version": "2.37",
+  "version": "2.39",
   "description": "Highlight occurrences of selected text, with or without a keypress.",
   "options_page": "${OPTIONS_PAGE_PATH}/options_page.html",
   "content_scripts": [{

diff --git a/src/highlighter/highlighter.js b/src/highlighter/highlighter.js
@@ -135,29 +135,21 @@ function initialize () {
     if (!options.isWindowLocationValid(window.location)) return;
     if (!options.areKeysPressed(pressedKeys)) return;
 
-    removeThenHighlight(latestStartTime);
-  };
-
-  function removeThenHighlight (startTime) {
-    requestAnimationFrame(() => {
-      if (startTime !== latestStartTime) return;
-
-      document.querySelectorAll('.' + options.highlightedClassName).forEach(element => {
-        const parent = element.parentNode;
-        if (parent) {
-          parent.replaceChild(new Text(element.textContent || ''), element);
-          parent.normalize();
-        }
-      });
-      if (options.areScrollMarkersEnabled()) {
-        document.querySelectorAll('.' + options.scrollMarkerClassName).forEach(element => {
-          document.body.removeChild(element);
-        });
+    document.querySelectorAll('.' + options.highlightedClassName).forEach(element => {
+      const parent = element.parentNode;
+      if (parent) {
+        parent.replaceChild(new Text(element.textContent || ''), element);
+        parent.normalize();
       }
-
-      highlight(startTime);
     });
-  }
+    if (options.areScrollMarkersEnabled()) {
+      document.querySelectorAll('.' + options.scrollMarkerClassName).forEach(element => {
+        document.body.removeChild(element);
+      });
+    }
+
+    highlight(latestStartTime);
+  };
 
   function highlight (startTime) {
     const selection = document.getSelection();