Merge pull request #341 from ales-erjavec/corpus-webview-js

ajdapretnar · web-flow · commit 1617257ce987 · 2018-05-04T10:23:53.000+02:00
[FIX] owcorpusviewer: Avoid 'synchronous' evalJS, use 'runJavaScript' instead
diff --git a/orangecontrib/text/widgets/owcorpusviewer.py b/orangecontrib/text/widgets/owcorpusviewer.py
@@ -3,7 +3,11 @@
 import sre_constants
 from itertools import chain
 
-from AnyQt.QtCore import Qt, QUrl, QItemSelection, QItemSelectionModel, QItemSelectionRange
+from AnyQt.QtCore import (
+    Qt, QUrl, QItemSelection, QItemSelectionModel, QItemSelectionRange,
+    pyqtSlot as Slot
+)
+
 from AnyQt.QtGui import QStandardItemModel, QStandardItem
 from AnyQt.QtWidgets import (QListView, QSizePolicy, QTableView,
                              QAbstractItemView, QHeaderView, QSplitter,
@@ -115,6 +119,7 @@ def __init__(self):
 
         # Document contents
         self.doc_webview = gui.WebviewWidget(self.splitter, debug=False)
+        self.doc_webview.loadFinished.connect(self.highlight_docs)
 
         self.mainArea.layout().addWidget(self.splitter)
 
@@ -222,6 +227,12 @@ def show_docs(self):
         <!doctype html>
         <html>
         <head>
+        <script type="text/javascript" src="resources/jquery-3.1.1.min.js">
+        </script>
+        <script type="text/javascript" src="resources/jquery.mark.min.js">
+        </script>
+        <script type="text/javascript" src="resources/highlighter.js">
+        </script>
         <meta charset='utf-8'>
         <style>
 
@@ -306,17 +317,8 @@ def show_docs(self):
                     token) for token in tokens[row_ind]))
 
         html += '</table>'
-
-        # QUrl is a workaround to allow local resources
-        # https://bugreports.qt.io/browse/QTBUG-55902?focusedCommentId=335945
-        self.doc_webview.setHtml(HTML.format(html), QUrl("file://"))
-        self.load_js()
-        self.highlight_docs()
-
-    def load_js(self):
-        resources = os.path.join(os.path.dirname(__file__), 'resources')
-        for script in ('jquery-3.1.1.min.js', 'jquery.mark.min.js', 'highlighter.js', ):
-            self.doc_webview.evalJS(open(os.path.join(resources, script), encoding='utf-8').read())
+        base = QUrl.fromLocalFile(__file__)
+        self.doc_webview.setHtml(HTML.format(html), base)
 
     def search_features_changed(self):
         self.regenerate_docs()
@@ -338,11 +340,21 @@ def refresh_search(self):
             self.update_info()
             self.commit()
 
+    @Slot()
     def highlight_docs(self):
         search_keyword = self.regexp_filter.\
             strip('|').replace('\\', '\\\\')    # escape one \ to  two for mark.js
+
         if search_keyword:
-            self.doc_webview.evalJS('mark("{}");'.format(search_keyword))
+            # mark is undefined when clearing the view (`setHtml('')`). Maybe
+            # set and template html with all the scripts, ... but no contents?
+            self.doc_webview.runJavaScript(
+                '''
+                    if (typeof mark !== "undefined") {{
+                        mark("{}");
+                    }}
+                '''.format(search_keyword)
+            )
 
     def update_info(self):
         if self.corpus is not None:
