# NetBeans IDE HG Patch # This patch file was generated by NetBeans IDE # Following Index: paths are relative to: /Users/antonepple/Entwicklung/DukeScript/html4j # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: boot-fx/src/main/java/net/java/html/boot/fx/FXBrowsers.java --- boot-fx/src/main/java/net/java/html/boot/fx/FXBrowsers.java +++ boot-fx/src/main/java/net/java/html/boot/fx/FXBrowsers.java @@ -27,7 +27,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL * or only the GPL Version 2, indicate your decision by adding Index: boot-fx/src/main/java/net/java/html/boot/fx/package.html --- boot-fx/src/main/java/net/java/html/boot/fx/package.html +++ boot-fx/src/main/java/net/java/html/boot/fx/package.html @@ -28,7 +28,7 @@ Contributor(s): The Original Software is NetBeans. The Initial Developer of the Original - Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding Index: boot-fx/src/main/java/org/netbeans/html/boot/fx/AbstractFXPresenter.java --- boot-fx/src/main/java/org/netbeans/html/boot/fx/AbstractFXPresenter.java +++ boot-fx/src/main/java/org/netbeans/html/boot/fx/AbstractFXPresenter.java @@ -27,7 +27,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL * or only the GPL Version 2, indicate your decision by adding @@ -282,15 +282,12 @@ } @Override - public Object toJava(Object toJS) { - if (toJS instanceof Weak) { - toJS = ((Weak)toJS).get(); + public Object toJava(Object jsArray) { + if (jsArray instanceof Weak) { + jsArray = ((Weak)jsArray).get(); } - if (toJS == undefined()) { - return null; + return checkArray(jsArray); } - return checkArray(toJS); - } @Override public Object toJavaScript(Object toReturn) { Index: boot-fx/src/main/java/org/netbeans/html/boot/fx/Dbgr.java --- boot-fx/src/main/java/org/netbeans/html/boot/fx/Dbgr.java +++ boot-fx/src/main/java/org/netbeans/html/boot/fx/Dbgr.java @@ -27,7 +27,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL * or only the GPL Version 2, indicate your decision by adding Index: boot-fx/src/main/java/org/netbeans/html/boot/fx/FXBrwsr.java --- boot-fx/src/main/java/org/netbeans/html/boot/fx/FXBrwsr.java +++ boot-fx/src/main/java/org/netbeans/html/boot/fx/FXBrwsr.java @@ -27,7 +27,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL * or only the GPL Version 2, indicate your decision by adding @@ -66,12 +66,15 @@ import javafx.scene.layout.HBox; import javafx.scene.layout.VBox; import javafx.scene.text.Text; +import javafx.scene.web.PopupFeatures; import javafx.scene.web.PromptData; +import javafx.scene.web.WebEngine; import javafx.scene.web.WebEvent; import javafx.scene.web.WebView; import javafx.stage.Modality; import javafx.stage.Screen; import javafx.stage.Stage; +import javafx.stage.StageStyle; import javafx.stage.Window; import javafx.stage.WindowEvent; import javafx.util.Callback; @@ -393,7 +396,17 @@ return res[0] ? line.getText() : null; } }); + view.getEngine().setCreatePopupHandler(new Callback() { + @Override + public WebEngine call(PopupFeatures param) { + final Stage stage = new Stage(StageStyle.UTILITY); + final WebView wv2 = new WebView(); + stage.setScene(new Scene(wv2)); + stage.show(); + return wv2.getEngine(); } + }); + } static void waitFinished() { for (;;) { Index: boot-fx/src/main/java/org/netbeans/html/boot/fx/FXConsole.java --- boot-fx/src/main/java/org/netbeans/html/boot/fx/FXConsole.java +++ boot-fx/src/main/java/org/netbeans/html/boot/fx/FXConsole.java @@ -27,7 +27,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL * or only the GPL Version 2, indicate your decision by adding Index: boot-fx/src/main/java/org/netbeans/html/boot/fx/FXInspect.java --- boot-fx/src/main/java/org/netbeans/html/boot/fx/FXInspect.java +++ boot-fx/src/main/java/org/netbeans/html/boot/fx/FXInspect.java @@ -27,7 +27,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL * or only the GPL Version 2, indicate your decision by adding Index: boot-fx/src/main/java/org/netbeans/html/boot/fx/FXPresenter.java --- boot-fx/src/main/java/org/netbeans/html/boot/fx/FXPresenter.java +++ boot-fx/src/main/java/org/netbeans/html/boot/fx/FXPresenter.java @@ -27,7 +27,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL * or only the GPL Version 2, indicate your decision by adding Index: boot-fx/src/main/java/org/netbeans/html/boot/fx/FXToolbar.java --- boot-fx/src/main/java/org/netbeans/html/boot/fx/FXToolbar.java +++ boot-fx/src/main/java/org/netbeans/html/boot/fx/FXToolbar.java @@ -27,7 +27,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL * or only the GPL Version 2, indicate your decision by adding Index: boot-fx/src/main/java/org/netbeans/html/boot/fx/WatchDir.java --- boot-fx/src/main/java/org/netbeans/html/boot/fx/WatchDir.java +++ boot-fx/src/main/java/org/netbeans/html/boot/fx/WatchDir.java @@ -27,7 +27,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL * or only the GPL Version 2, indicate your decision by adding Index: boot-fx/src/main/resources/org/netbeans/html/boot/fx/Bundle.properties --- boot-fx/src/main/resources/org/netbeans/html/boot/fx/Bundle.properties +++ boot-fx/src/main/resources/org/netbeans/html/boot/fx/Bundle.properties @@ -27,7 +27,7 @@ # Contributor(s): # # The Original Software is NetBeans. The Initial Developer of the Original -# Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. +# Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. # # If you wish your version of this file to be governed by only the CDDL # or only the GPL Version 2, indicate your decision by adding Index: boot-fx/src/test/java/net/java/html/boot/fx/FXBrowsersOnResourceTest.java --- boot-fx/src/test/java/net/java/html/boot/fx/FXBrowsersOnResourceTest.java +++ boot-fx/src/test/java/net/java/html/boot/fx/FXBrowsersOnResourceTest.java @@ -27,7 +27,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL * or only the GPL Version 2, indicate your decision by adding Index: boot-fx/src/test/java/net/java/html/boot/fx/FXBrowsersTest.java --- boot-fx/src/test/java/net/java/html/boot/fx/FXBrowsersTest.java +++ boot-fx/src/test/java/net/java/html/boot/fx/FXBrowsersTest.java @@ -27,7 +27,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL * or only the GPL Version 2, indicate your decision by adding Index: boot-fx/src/test/java/org/netbeans/html/boot/fx/FXBrwsrTest.java --- boot-fx/src/test/java/org/netbeans/html/boot/fx/FXBrwsrTest.java +++ boot-fx/src/test/java/org/netbeans/html/boot/fx/FXBrwsrTest.java @@ -27,7 +27,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL * or only the GPL Version 2, indicate your decision by adding Index: boot-fx/src/test/java/org/netbeans/html/boot/fx/FXJavaScriptTest.java --- boot-fx/src/test/java/org/netbeans/html/boot/fx/FXJavaScriptTest.java +++ boot-fx/src/test/java/org/netbeans/html/boot/fx/FXJavaScriptTest.java @@ -27,7 +27,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL * or only the GPL Version 2, indicate your decision by adding Index: boot-fx/src/test/java/org/netbeans/html/boot/fx/FXPresenterTst.java --- boot-fx/src/test/java/org/netbeans/html/boot/fx/FXPresenterTst.java +++ boot-fx/src/test/java/org/netbeans/html/boot/fx/FXPresenterTst.java @@ -27,7 +27,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL * or only the GPL Version 2, indicate your decision by adding Index: boot-fx/src/test/java/org/netbeans/html/boot/fx/FxJavaScriptTst.java --- boot-fx/src/test/java/org/netbeans/html/boot/fx/FxJavaScriptTst.java +++ boot-fx/src/test/java/org/netbeans/html/boot/fx/FxJavaScriptTst.java @@ -27,7 +27,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL * or only the GPL Version 2, indicate your decision by adding Index: boot-fx/src/test/java/org/netbeans/html/boot/fx/KOFx.java --- boot-fx/src/test/java/org/netbeans/html/boot/fx/KOFx.java +++ boot-fx/src/test/java/org/netbeans/html/boot/fx/KOFx.java @@ -27,7 +27,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL * or only the GPL Version 2, indicate your decision by adding Index: boot-fx/src/test/java/org/netbeans/html/boot/fx/ReloadTest.java --- boot-fx/src/test/java/org/netbeans/html/boot/fx/ReloadTest.java +++ boot-fx/src/test/java/org/netbeans/html/boot/fx/ReloadTest.java @@ -27,7 +27,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL * or only the GPL Version 2, indicate your decision by adding Index: boot-fx/src/test/java/org/netbeans/html/boot/fx/TestingProvider.java --- boot-fx/src/test/java/org/netbeans/html/boot/fx/TestingProvider.java +++ boot-fx/src/test/java/org/netbeans/html/boot/fx/TestingProvider.java @@ -27,7 +27,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL * or only the GPL Version 2, indicate your decision by adding Index: boot-fx/src/test/java/org/netbeans/html/boot/fx/TitleTest.java --- boot-fx/src/test/java/org/netbeans/html/boot/fx/TitleTest.java +++ boot-fx/src/test/java/org/netbeans/html/boot/fx/TitleTest.java @@ -27,7 +27,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL * or only the GPL Version 2, indicate your decision by adding Index: boot-fx/src/test/java/org/sample/app/pkg/SampleApp.java --- boot-fx/src/test/java/org/sample/app/pkg/SampleApp.java +++ boot-fx/src/test/java/org/sample/app/pkg/SampleApp.java @@ -27,7 +27,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL * or only the GPL Version 2, indicate your decision by adding Index: boot-fx/src/test/resources/net/java/html/boot/fx/wnd.js --- boot-fx/src/test/resources/net/java/html/boot/fx/wnd.js +++ boot-fx/src/test/resources/net/java/html/boot/fx/wnd.js @@ -27,7 +27,7 @@ * Contributor(s): * * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + * Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. * * If you wish your version of this file to be governed by only the CDDL * or only the GPL Version 2, indicate your decision by adding Index: boot-fx/src/test/resources/org/netbeans/html/boot/fx/empty.html --- boot-fx/src/test/resources/org/netbeans/html/boot/fx/empty.html +++ boot-fx/src/test/resources/org/netbeans/html/boot/fx/empty.html @@ -28,7 +28,7 @@ Contributor(s): The Original Software is NetBeans. The Initial Developer of the Original - Software is Oracle. Portions Copyright 2013-2016 Oracle. All Rights Reserved. + Software is Oracle. Portions Copyright 2013-2014 Oracle. All Rights Reserved. If you wish your version of this file to be governed by only the CDDL or only the GPL Version 2, indicate your decision by adding