1.1 --- a/.hgtags Wed Aug 26 07:30:32 2015 +0200
1.2 +++ b/.hgtags Sat Aug 29 01:45:48 2015 +0200
1.3 @@ -35,3 +35,4 @@
1.4 ce36930eb669424a28ff610f66f0b55300daff55 release-1.0
1.5 6f4cce1be53291f893857f388cb0b718d00bb4f1 release-1.1
1.6 3b8546edbf03f20f55dffeac58bbe235b0940998 release-1.2
1.7 +0000000000000000000000000000000000000000 release-1.2
2.1 --- a/boot-fx/src/main/java/org/netbeans/html/boot/fx/AbstractFXPresenter.java Wed Aug 26 07:30:32 2015 +0200
2.2 +++ b/boot-fx/src/main/java/org/netbeans/html/boot/fx/AbstractFXPresenter.java Sat Aug 29 01:45:48 2015 +0200
2.3 @@ -165,19 +165,19 @@
2.4 } catch (Throwable ex) {
2.5 ex.printStackTrace();
2.6 }
2.7 + final boolean isFirebugOn = Boolean.getBoolean("firebug.lite"); // NOI18N
2.8 final boolean isInspectOn = inspectOn;
2.9 -
2.10 class Run implements Runnable {
2.11
2.12 @Override
2.13 public void run() {
2.14 - if (isInspectOn) {
2.15 + if (isInspectOn || isFirebugOn) {
2.16 view.setContextMenuEnabled(true);
2.17 final Parent p = view.getParent();
2.18 if (p instanceof BorderPane) {
2.19 BorderPane bp = (BorderPane) p;
2.20 if (bp.getTop() == null) {
2.21 - bp.setTop(new FXToolbar(view, bp));
2.22 + bp.setTop(new FXToolbar(view, bp, isFirebugOn));
2.23 }
2.24 }
2.25 }
3.1 --- a/boot-fx/src/main/java/org/netbeans/html/boot/fx/FXToolbar.java Wed Aug 26 07:30:32 2015 +0200
3.2 +++ b/boot-fx/src/main/java/org/netbeans/html/boot/fx/FXToolbar.java Sat Aug 29 01:45:48 2015 +0200
3.3 @@ -67,6 +67,7 @@
3.4 import javafx.scene.image.Image;
3.5 import javafx.scene.image.ImageView;
3.6 import javafx.scene.layout.BorderPane;
3.7 +import javafx.scene.web.WebEngine;
3.8 import javafx.scene.web.WebView;
3.9 import javafx.stage.Screen;
3.10 import javafx.stage.Stage;
3.11 @@ -80,7 +81,7 @@
3.12 private final ComboBox<String> comboZoom = new ComboBox<String>();
3.13 private WatchDir watcher;
3.14
3.15 - FXToolbar(WebView wv, BorderPane container) {
3.16 + FXToolbar(WebView wv, BorderPane container, boolean enableFirebug) {
3.17 this.webView = wv;
3.18 this.container = container;
3.19
3.20 @@ -151,6 +152,17 @@
3.21 listenOnChanges(automatic.isSelected());
3.22 }
3.23 });
3.24 + if (enableFirebug){
3.25 + final Button firebug = new Button("Firebug");
3.26 + getItems().add(firebug);
3.27 + firebug.setOnAction(new EventHandler<ActionEvent>() {
3.28 +
3.29 + @Override
3.30 + public void handle(ActionEvent event) {
3.31 + enableFirebug(webView.getEngine());
3.32 + firebug.setDisable(true);
3.33 + }
3.34 + });}
3.35 }
3.36
3.37 private String zoom( String zoomFactor ) {
3.38 @@ -418,4 +430,7 @@
3.39 FXInspect.LOG.log(Level.SEVERE, null, ex);
3.40 }
3.41 }
3.42 + private static void enableFirebug(final WebEngine engine) {
3.43 + 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');}");
3.44 + }
3.45 }
4.1 --- a/json-tck/src/main/java/net/java/html/json/tests/KnockoutTest.java Wed Aug 26 07:30:32 2015 +0200
4.2 +++ b/json-tck/src/main/java/net/java/html/json/tests/KnockoutTest.java Sat Aug 29 01:45:48 2015 +0200
4.3 @@ -116,8 +116,8 @@
4.4
4.5 @KOTest public void modifyRadioValueOnEnum() throws Throwable {
4.6 Object exp = Utils.exposeHTML(KnockoutTest.class,
4.7 - "<input id='i1' type=\"radio\" name=\"choice\" value=\"A\" data-bind=\"checked: choice\">Right\n" +
4.8 - "<input id='input' type=\"radio\" name=\"choice\" value=\"B\" data-bind=\"checked: choice\">Never\n" +
4.9 + "<input id='i1' type=\"radio\" name=\"choice\" value=\"A\" data-bind=\"checked: choice\"></input>Right\n" +
4.10 + "<input id='input' type=\"radio\" name=\"choice\" value=\"B\" data-bind=\"checked: choice\"></input>Never\n" +
4.11 "\n"
4.12 );
4.13 try {
5.1 --- a/src/main/javadoc/overview.html Wed Aug 26 07:30:32 2015 +0200
5.2 +++ b/src/main/javadoc/overview.html Sat Aug 29 01:45:48 2015 +0200
5.3 @@ -81,6 +81,11 @@
5.4 when connecting to server using the {@link net.java.html.json.OnReceive}
5.5 annotation. It is possible to have
5.6 {@link net.java.html.json.ComputedProperty#write() writable computed properties}.
5.7 + There is an easy way to enable <a target="_blank" href="http://getfirebug.com/">Firebug</a> in
5.8 + the JavaFX based Web View -
5.9 + just run with <code>-Dfirebug.lite=true</code> as
5.10 + <a target="_blank" href="https://www.youtube.com/watch?v=2rxwY-QJiLo">this video</a>
5.11 + demonstrates.
5.12 Bugfix of issues <a target="_blank" href='https://netbeans.org/bugzilla/show_bug.cgi?id=250503'>250503</a>,
5.13 <a target="_blank" href='https://netbeans.org/bugzilla/show_bug.cgi?id=252987'>252987</a>.
5.14