Fix issue in editorpane

asciidocfx · Dec 4, 2015 · f9786d8 · f9786d8
1 parent 612f279
commit f9786d8
Showing 1 changed file with 20 additions and 10 deletions.
diff --git a/src/main/java/com/kodcu/component/EditorPane.java b/src/main/java/com/kodcu/component/EditorPane.java
@@ -12,10 +12,10 @@
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.event.Event;
-import javafx.scene.Node;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.input.Dragboard;
@@ -88,26 +88,20 @@ public EditorPane(ApplicationController controller, ThreadService threadService,
         this.handleReadyTasks = FXCollections.observableArrayList();
         this.parserService = parserService;
         this.webView = new WebView();
+        this.ready.addListener(this::afterEditorReady);
         webEngine().setConfirmHandler(this::handleConfirm);
         initializeMargins();
         initializeEditorContextMenus();
     }
 
     private Boolean handleConfirm(String param) {
         if ("command:ready".equals(param)) {
-            handleEditorReady();
-            ObservableList<Runnable> runnables = FXCollections.observableArrayList(handleReadyTasks);
-            handleReadyTasks.clear();
-            for (Runnable runnable : runnables) {
-                runnable.run();
-            }
-            ready.setValue(true);
-            updatePreviewUrl();
+            afterEditorLoaded();
         }
         return false;
     }
 
-    private void handleEditorReady() {
+    private void afterEditorLoaded() {
         getWindow().setMember("afx", controller);
         updateOptions();
 
@@ -120,18 +114,34 @@ private void handleEditorReady() {
                     setInitialized();
                     setEditorValue(content);
                     resetUndoManager();
+                    ready.setValue(true);
                 });
             });
         } else {
             setInitialized();
             setEditorValue(initialEditorValue);
             resetUndoManager();
+            ready.setValue(true);
         }
 
         this.getChildren().add(webView);
         webView.requestFocus();
     }
 
+    private void afterEditorReady(ObservableValue observable, boolean oldValue, boolean newValue) {
+        if (newValue) {
+            ObservableList<Runnable> runnables = FXCollections.observableArrayList(handleReadyTasks);
+            handleReadyTasks.clear();
+            for (Runnable runnable : runnables) {
+                runnable.run();
+            }
+
+            updatePreviewUrl();
+        }
+    }
+
+    ;
+
     public void updatePreviewUrl() {
         threadService.runActionLater(() -> {
             if (is("asciidoc") || is("markdown")) {