remove highlith listener before adding new one

use innertext in js
JabRef · May 4, 2019 · d99edc7 · d99edc7
1 parent 6255111
commit d99edc7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/main/java/org/jabref/gui/PreviewPanel.java b/src/main/java/org/jabref/gui/PreviewPanel.java
@@ -59,8 +59,8 @@ public class PreviewPanel extends ScrollPane implements EntryContainer {
 
     private static String JS_HIGHLIGHT_FUNCTION = " <script type=\"text/javascript\">\r\n" +
                                                   "        function highlight(text) {\r\n" +
-                                                  "            var innerhtml = document.body.innerHTML;\r\n" +
-                                                  "            var response = innerhtml.replace(new RegExp(text, 'gi'), str => `<span style='background-color:red'>${str}</span>`);\r\n" +
+                                                  "            var innertxt = document.body.innerText;\r\n" +
+                                                  "            var response = innertxt.replace(new RegExp(text, 'gi'), str => `<span style='background-color:red'>${str}</span>`);\r\n" +
                                                   "            document.body.innerHTML = response;\r\n" +
                                                   "        }\r\n" +
                                                   "    </script>";
@@ -161,6 +161,7 @@ public PreviewPanel(BasePanel panel, BibDatabaseContext databaseContext, KeyBind
         createKeyBindings();
         updateLayout(preferences, true);
 
+
     }
 
     private void createKeyBindings() {
@@ -218,6 +219,7 @@ public void setBasePanel(BasePanel basePanel) {
 
     public void updateLayout(PreviewPreferences previewPreferences) {
         updateLayout(previewPreferences, false);
+        Globals.stateManager.fireSearchQueryHighlightEvent();
     }
 
     private void updateLayout(PreviewPreferences previewPreferences, boolean init) {
@@ -331,27 +333,23 @@ private void setPreviewLabel(String text) {
 
         DefaultTaskExecutor.runInJavaFXThread(() -> previewView.getEngine().loadContent(myText));
         this.setHvalue(0);
-
         previewView.getEngine().getLoadWorker().stateProperty().addListener((ObservableValue<? extends Worker.State> observable,
                                                                              Worker.State oldValue,
                                                                              Worker.State newValue) -> {
             if (newValue != Worker.State.SUCCEEDED) {
                 return;
             }
-
             Globals.stateManager.addSearchQueryHighlightListener(highlightPattern -> {
                 if (highlightPattern.isPresent()) {
-                    String pattern  = highlightPattern.get().pattern().replace("\\Q", "").replace("\\E", "");
+                    String pattern = highlightPattern.get().pattern().replace("\\Q", "").replace("\\E", "");
 
                     previewView.getEngine().executeScript("highlight('" + pattern + "');");
+
                 }
             });
         });
-
     }
 
-
-
     /**
      * this fixes the Layout, the user cannot change it anymore. Useful for testing the styles in the settings
      *

diff --git a/src/main/java/org/jabref/gui/StateManager.java b/src/main/java/org/jabref/gui/StateManager.java
@@ -120,6 +120,7 @@ public void resetSearchQueryHighlightObservable()
     }
 
     public void addSearchQueryHighlightListener(SearchQueryHighlightListener listener) {
+        searchQueryHighlightObservable.removeSearchListener(listener);
         searchQueryHighlightObservable.addSearchListener(listener);
     }
 }