click-on-url improved for JavaFX when slow-loading images are referen…

…ced in the preview #121
asciidoctor · Aug 20, 2016 · 33820a1 · 33820a1
1 parent e1b7c5d
commit 33820a1
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 17 deletions.
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -16,7 +16,8 @@
 
   <change-notes><![CDATA[
     <ul>
-      <li>0.15.2 fixed detection of Mac 64 JVM to be able to activate JavaFX preview</li>
+      <li>0.15.2 fixed detection of Mac 64 JVM to be able to activate JavaFX preview
+        <br />click-on-url for JavaFX improved, when slow-loading external images are referenced</li>
       <li>0.15.1 revised constrained/unconstrained detection
         <br />Fix situation in syntax highlighting leading to PSI Parser Exceptions
         <br />refreshing images on JavaFX only if their content has changed to save memory consumption

diff --git a/README.adoc b/README.adoc
@@ -11,6 +11,7 @@ If you want to use JavaFX preview, you'll need to run IntelliJ with 64bit Java.
 === 0.15.2 (preview, available from Github releases)
 
 - fixed detection of Mac 64 JVM to be able to activate JavaFX preview
+- click-on-url for JavaFX improved, when slow-loading external images are referenced
 
 === 0.15.1 (preview, available from Github releases)
 

diff --git a/src/main/java/org/asciidoc/intellij/editor/javafx/JavaFxHtmlPanel.java b/src/main/java/org/asciidoc/intellij/editor/javafx/JavaFxHtmlPanel.java
@@ -328,9 +328,15 @@ public void log(@Nullable String text) {
   private class BridgeSettingListener implements ChangeListener<State> {
     @Override
     public void changed(ObservableValue<? extends State> observable, State oldValue, State newValue) {
-      JSObject win
-          = (JSObject)getWebViewGuaranteed().getEngine().executeScript("window");
-      win.setMember("JavaPanelBridge", new JavaPanelBridge());
+      if (newValue == State.SUCCEEDED) {
+        JSObject win
+            = (JSObject)getWebViewGuaranteed().getEngine().executeScript("window");
+        win.setMember("JavaPanelBridge", new JavaPanelBridge());
+        JavaFxHtmlPanel.this.getWebViewGuaranteed().getEngine().executeScript(
+            "if ('__IntelliJTools' in window) " +
+                "__IntelliJTools.processLinks();"
+        );
+      }
     }
   }
 

diff --git a/src/main/resources/org/asciidoc/intellij/editor/javafx/processLinks.js b/src/main/resources/org/asciidoc/intellij/editor/javafx/processLinks.js
@@ -2,12 +2,12 @@ if (window.__IntelliJTools === undefined) {
   window.__IntelliJTools = {}
 }
 
-(function() {
-  var openInExternalBrowser = function(href) {
+window.__IntelliJTools.processLinks = (function () {
+  var openInExternalBrowser = function (href) {
     window.JavaPanelBridge.openInExternalBrowser(href);
   }
 
-  window.__IntelliJTools.processClick = function() {
+  window.__IntelliJTools.processClick = function () {
     if (!this.href) {
       return false;
     }
@@ -26,17 +26,18 @@ if (window.__IntelliJTools === undefined) {
     return false;
   }
 
-  window.onload = function() {
-    setTimeout(function () {
-      var links = document.getElementsByTagName("a");
-      //window.JavaPanelBridge.log(links.length)
-      for (var i = 0; i < links.length; ++i) {
-        var link = links[i];
+  var processLinks = function () {
+    var links = document.getElementsByTagName("a");
+    // window.JavaPanelBridge.log(links.length)
+    for (var i = 0; i < links.length; ++i) {
+      var link = links[i];
 
-        link.onclick = __IntelliJTools.processClick
-        //window.JavaPanelBridge.log(link + ' ' + link.onclick)
-      }
-    }, 100)
+      link.onclick = __IntelliJTools.processClick
+      // window.JavaPanelBridge.log(link + ' ' + link.onclick)
+    }
   }
 
+  return processLinks;
+
 })()
+