diff -r 2d52faa0c40a -r fb4ed6cc0d4b javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/Element.java
--- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/Element.java	Sat Jan 12 10:44:37 2013 +0100
+++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/api/Element.java	Sat Jan 12 20:24:30 2013 +0100
@@ -51,11 +51,11 @@
      * @param r the runnable to execute, never null
      */
     @JavaScriptBody(
-        args={"el", "r"},
-        body="var e = window.document.getElementById(el.fld_id);\n"
-           + "e.onclick = function() { r.run__V(); };\n"
+        args={ "self", "ev", "r" },
+        body="var e = window.document.getElementById(self.fld_id);\n"
+           + "e[ev.fld_id] = function() { r.run__V(r); };\n"
     )
-    public final native void addOnClick(Runnable r);
+    final native void on(OnEvent ev, Runnable r);
 
     /** Shows alert message dialog in a browser.
      * @param msg the message to show