1.1 --- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/HTML5GraphicsEnvironment.java Wed Sep 18 11:25:14 2013 +0200
1.2 +++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/HTML5GraphicsEnvironment.java Mon Sep 23 07:09:13 2013 -0700
1.3 @@ -30,16 +30,23 @@
1.4 import net.java.html.canvas.spi.GraphicsEnvironment;
1.5 import org.apidesign.bck2brwsr.core.JavaScriptBody;
1.6 import org.apidesign.bck2brwsr.htmlpage.api.Canvas;
1.7 +import org.openide.util.lookup.ServiceProvider;
1.8
1.9 /**
1.10 *
1.11 * @author Anton Epple <toni.epple@eppleton.de>
1.12 */
1.13 +@ServiceProvider(service = GraphicsEnvironment.class)
1.14 public class HTML5GraphicsEnvironment implements GraphicsEnvironment {
1.15
1.16 Object context;
1.17 Canvas canvas;
1.18
1.19 + public HTML5GraphicsEnvironment() {
1.20 + }
1.21 +
1.22 +
1.23 +
1.24 public HTML5GraphicsEnvironment(Object contextImpl, Canvas canvas) {
1.25 this.context = contextImpl;
1.26 this.canvas = canvas;
1.27 @@ -233,7 +240,7 @@
1.28 "gradient.addColorStop(position,color)")
1.29 private static native void addColorStopImpl(Object gradient, double position, String color);
1.30
1.31 - @JavaScriptBody(args = {"context", "obj"}, body = "console.log('style: '+obj);context.fillStyle=obj;")
1.32 + @JavaScriptBody(args = {"context", "obj"}, body = "context.fillStyle=obj;")
1.33 private native void setFillStyleImpl(Object context, Object obj);
1.34
1.35 @JavaScriptBody(args = {"style"}, body = "this._context().strokeStyle=style.valueOf();")
1.36 @@ -470,13 +477,16 @@
1.37 canvas.setWidth(width);
1.38 }
1.39
1.40 - @JavaScriptBody(args = {"src"}, body = "var image = new Image(); image.src = src; return image;")
1.41 +// @JavaScriptBody(args = {"src"}, body = "var image = new Image();console.log('image complete '+image.complete);image.src = './'+ src; return image;")
1.42 + @JavaScriptBody(args = {"src"}, body = "console.log ('looking up image by id '+src);return document.getElementById(src);")
1.43 private static native Object createImage(String src);
1.44
1.45 @Override
1.46 public int getWidth(Image image, Object nativeImage) {
1.47 +
1.48 if (nativeImage == null) {
1.49 nativeImage = createImage(image.getSrc());
1.50 +
1.51 }
1.52 return getWidth(nativeImage);
1.53 }
2.1 --- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/Logger.java Wed Sep 18 11:25:14 2013 +0200
2.2 +++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/Logger.java Mon Sep 23 07:09:13 2013 -0700
2.3 @@ -13,7 +13,7 @@
2.4 public class Logger {
2.5
2.6 @JavaScriptBody(args = "message",body = "console.log(message)")
2.7 - public static native void log(String text);
2.8 + public static native void log(String message);
2.9
2.10 @JavaScriptBody(args = "object",body = "console.log(object)")
2.11 public static native void logObject(Object object);