Merge branch 'release/0.3.3'

build.gradle

@@ -2,7 +2,7 @@ group 'de.de.x4fyr'
 
 ext.major_version = 0
 ext.minor_version = 3
-ext.revision_number = 2
+ext.revision_number = 3
 version "$major_version.$minor_version.$revision_number"
 println("version: $version")
 

desktop/src/main/java/de/x4fyr/paiman/app/App.kt

@@ -3,9 +3,10 @@ package de.x4fyr.paiman.app
 import de.x4fyr.paiman.app.services.JavaFxWebViewService
 import de.x4fyr.paiman.app.ui.views.entry.EntryController
 import de.x4fyr.paiman.dagger.DaggerMainComponent
-import de.x4fyr.paiman.dagger.desktop.DesktopServiceModule
 import de.x4fyr.paiman.dagger.MainComponent
+import de.x4fyr.paiman.dagger.desktop.DesktopServiceModule
 import javafx.application.Application
+import javafx.application.Platform
 import javafx.scene.Scene
 import javafx.scene.layout.StackPane
 import javafx.stage.Stage
@@ -32,6 +33,12 @@ class App: Application() {
             val scene = Scene(stackPane)
             primaryStage.scene = scene
             primaryStage.show()
+
+            primaryStage.onCloseRequest = javafx.event.EventHandler {
+                Platform.exit()
+                System.exit(0)
+            }
+
         }
     }
 

desktop/src/main/java/de/x4fyr/paiman/app/services/JavaFxWebViewService.kt

@@ -29,10 +29,10 @@ class JavaFxWebViewService : WebViewService {
                 }
             }
         }
-        webView.engine.documentProperty().addListener { _, _, _ ->
-            webView.engine.executeScript("if (!document.getElementById('FirebugLite')){E = document['createElement' + 'NS'] && document.documentElement.namespaceURI;E = E ? document['createElement' + 'NS'](E, 'script') : document['createElement']('script');E['setAttribute']('id', 'FirebugLite');E['setAttribute']('src', 'https://getfirebug.com/' + 'firebug-lite.js' + '#startOpened');E['setAttribute']('FirebugLite', '4');(document['getElementsByTagName']('head')[0] || document['getElementsByTagName']('body')[0]).appendChild(E);E = new Image;E['setAttribute']('src', 'https://getfirebug.com/' + '#startOpened');}");
-            (webView.engine.executeScript("window") as JSObject).setMember("javaDebug", Debug())
-        }
+        //webView.engine.documentProperty().addListener { _, _, _ ->
+        //    webView.engine.executeScript("if (!document.getElementById('FirebugLite')){E = document['createElement' + 'NS'] && document.documentElement.namespaceURI;E = E ? document['createElement' + 'NS'](E, 'script') : document['createElement']('script');E['setAttribute']('id', 'FirebugLite');E['setAttribute']('src', 'https://getfirebug.com/' + 'firebug-lite.js' + '#startOpened');E['setAttribute']('FirebugLite', '4');(document['getElementsByTagName']('head')[0] || document['getElementsByTagName']('body')[0]).appendChild(E);E = new Image;E['setAttribute']('src', 'https://getfirebug.com/' + '#startOpened');}");
+        //    (webView.engine.executeScript("window") as JSObject).setMember("javaDebug", Debug())
+        //}
     }