diff --git a/sources/net.sf.j2s.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/SwingJS-site.zip
index aaed84687..7dff9a3c0 100644
Binary files a/sources/net.sf.j2s.core/dist/SwingJS-site.zip and b/sources/net.sf.j2s.core/dist/SwingJS-site.zip differ
diff --git a/sources/net.sf.j2s.core/dist/dropins/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/dropins/net.sf.j2s.core.jar
index 5600e1341..4c2b41701 100644
Binary files a/sources/net.sf.j2s.core/dist/dropins/net.sf.j2s.core.jar and b/sources/net.sf.j2s.core/dist/dropins/net.sf.j2s.core.jar differ
diff --git a/sources/net.sf.j2s.core/dist/dropins/timestamp b/sources/net.sf.j2s.core/dist/dropins/timestamp
index f0bf638e7..c4d06c9ed 100644
--- a/sources/net.sf.j2s.core/dist/dropins/timestamp
+++ b/sources/net.sf.j2s.core/dist/dropins/timestamp
@@ -1 +1 @@
-20180807004156
+20180807091649
diff --git a/sources/net.sf.j2s.core/dist/dropins/ver/3.2.2/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/dropins/ver/3.2.2/SwingJS-site.zip
index aaed84687..7dff9a3c0 100644
Binary files a/sources/net.sf.j2s.core/dist/dropins/ver/3.2.2/SwingJS-site.zip and b/sources/net.sf.j2s.core/dist/dropins/ver/3.2.2/SwingJS-site.zip differ
diff --git a/sources/net.sf.j2s.core/dist/dropins/ver/3.2.2/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/dropins/ver/3.2.2/net.sf.j2s.core.jar
index 5600e1341..4c2b41701 100644
Binary files a/sources/net.sf.j2s.core/dist/dropins/ver/3.2.2/net.sf.j2s.core.jar and b/sources/net.sf.j2s.core/dist/dropins/ver/3.2.2/net.sf.j2s.core.jar differ
diff --git a/sources/net.sf.j2s.core/dist/dropins/ver/3.2.2/timestamp b/sources/net.sf.j2s.core/dist/dropins/ver/3.2.2/timestamp
index f0bf638e7..c4d06c9ed 100644
--- a/sources/net.sf.j2s.core/dist/dropins/ver/3.2.2/timestamp
+++ b/sources/net.sf.j2s.core/dist/dropins/ver/3.2.2/timestamp
@@ -1 +1 @@
-20180807004156
+20180807091649
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java
index 6856d188a..65ea8d095 100644
--- a/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java
+++ b/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java
@@ -6324,8 +6324,11 @@ private static boolean addJ2SSourceForTag(StringBuffer buffer, TagElement tag, b
// end with 0 && to replace a number with 0.
// end with null && to replace anything with null
// end with 1?xxx: to replace anything with xxx
+ // /** @j2sNatve ! */true
+ // (/** @j2sNative 1?x: */y)
+ // /** @j2sNative true || */javaOnly()
- boolean isInline = code.endsWith("|") || code.endsWith("&") || code.endsWith(":");
+ boolean isInline = code.endsWith("|") || code.endsWith("&") || code.endsWith(":") || code.endsWith("!");
buffer.append(isInline ? "" : addPrefix ? "{\r\n" : "\r\n");
buffer.append(code);
buffer.append(isInline ? "" : addPostfix ? "\r\n}\r\n" : "\r\n");
diff --git a/sources/net.sf.j2s.java.core/build_core_applet.xml b/sources/net.sf.j2s.java.core/build_core_applet.xml
index 092263932..8ce874f8f 100644
--- a/sources/net.sf.j2s.java.core/build_core_applet.xml
+++ b/sources/net.sf.j2s.java.core/build_core_applet.xml
@@ -292,11 +292,10 @@
" />
- TODO: Could delete demo html files?
-
creating dist/SwingJS-site.zip
+
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
index aaed84687..7dff9a3c0 100644
Binary files a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip and b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip differ
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java b/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java
index 21c369583..4af4e7f23 100644
--- a/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java
+++ b/sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java
@@ -395,7 +395,7 @@ public static int dispatch(Object f, int msDelay, int id) {
* f();
* } catch (e) {
* var s = "JSToolkit.dispatch$I(" + id +"): "
- * + e + "\n" + (e.getStackTrace$ ? e.getStackTrac$e() + "\n" : "") + (!!e.stack ? e.stack : "");
+ * + e + "\n" + (e.getStackTrace$ ? e.getStackTrace$() + "\n" : "") + (!!e.stack ? e.stack : "");
* System.out.println(s);
* alert(s);
* }
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sMenu.js b/sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sMenu.js
index f16c531a0..c9c76d7de 100644
--- a/sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sMenu.js
+++ b/sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sMenu.js
@@ -217,13 +217,13 @@ Swing.showMenu = function(menu, x, y) {
menu.$ulTop.find("[role=menuitem]").each(function(){
var node = this;
node.applet = menu._applet;
- node._frameViewer = menu.invoker.getFrameViewer();
+ node._frameViewer = menu.invoker.getFrameViewer$();
node._menu = menu;
J2S._jsSetMouse(node, true);
});
}
menu._visible = true;
- menu.timestamp = System.currentTimeMillis();
+ menu.timestamp = System.currentTimeMillis$();
menu.dragBind(true);
menu.$ulTop.unbind('clickoutjsmol mousemoveoutjsmol');
if (!J2S._persistentMenu)
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js
index b1dcdb067..4658d67f8 100644
--- a/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js
+++ b/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js
@@ -1807,6 +1807,8 @@ if (!J2S._version)
xym[2] = J2S._getKeyModifiers(ev);
var ui = ev.target["data-ui"];
+
+
// if (who.isdragging && (!ui || !ui.handleJSEvent(who, 506, ev))) {}
who.applet._processEvent((who.isDragging ? 506 : 503), xym, ev,
who._frameViewer); // MouseEvent.MOUSE_DRAGGED :
@@ -2341,7 +2343,7 @@ if (!J2S._version)
if (w > 0 && h > 0 && (!applet._canvas || w != applet._canvas.width
|| h != applet._canvas.height)) {
// developer has used static { thisApplet.__Info.width=...}
- J2S.$(applet, "appletdiv").width(w).height(h);
+ J2S.$(applet, "appletinfotablediv").width(w).height(h);
applet._newCanvas(true);
}
applet._newApplet(viewerOptions);
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
index c2d6690fa..eeec069a3 100644
--- a/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
+++ b/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
@@ -11,7 +11,7 @@
// It is possible that these might be loaded dynamically.
// BH 8/6/2018 3.2.2 sets user.home to be "https://./"
-// BH 8/6/2018 3.2.2 adds ?j2squiet option
+// BH 8/6/2018 3.2.2 adds ?j2sverbose option -- lists all files loaded; sets Clazz._quiet = false
// BH 8/5/2018 3.2.2 adds Clazz.newLambda(...)
// BH 8/4/2018 3.2.2 cleans up String $-qualified methods headless and javax tests pass
// BH 8/1/2018 3.2.2 adds default interface methods as C$.$defaults$
@@ -90,11 +90,11 @@ window["j2s.clazzloaded"] = true;
*/
/* static */
/*Class = */ Clazz = {
- _isQuiet: false,
+ _isQuiet: true,
_debugging: false,
_loadcore: true,
_nooutput: 0,
- _VERSION: "3.2.2.01",
+ _VERSION: "3.2.2.03",
_VERSION_T: "unknown",
};
@@ -103,7 +103,7 @@ window["j2s.clazzloaded"] = true;
try {
Clazz._debugging = (document.location.href.indexOf("j2sdebug") >= 0);
Clazz._loadcore = (document.location.href.indexOf("j2snocore") < 0);
- Clazz._quiet = (document.location.href.indexOf("j2squiet") >= 0);
+ Clazz._quiet = (document.location.href.indexOf("j2sverbose") < 0);
} catch (e) {}
try {
diff --git a/sources/net.sf.j2s.java.core/srcjs/swingjs2.js b/sources/net.sf.j2s.java.core/srcjs/swingjs2.js
index 99223df6a..6b40f09d5 100644
--- a/sources/net.sf.j2s.java.core/srcjs/swingjs2.js
+++ b/sources/net.sf.j2s.java.core/srcjs/swingjs2.js
@@ -12462,6 +12462,8 @@ if (!J2S._version)
xym[2] = J2S._getKeyModifiers(ev);
var ui = ev.target["data-ui"];
+
+
// if (who.isdragging && (!ui || !ui.handleJSEvent(who, 506, ev))) {}
who.applet._processEvent((who.isDragging ? 506 : 503), xym, ev,
who._frameViewer); // MouseEvent.MOUSE_DRAGGED :
@@ -12996,7 +12998,7 @@ if (!J2S._version)
if (w > 0 && h > 0 && (!applet._canvas || w != applet._canvas.width
|| h != applet._canvas.height)) {
// developer has used static { thisApplet.__Info.width=...}
- J2S.$(applet, "appletdiv").width(w).height(h);
+ J2S.$(applet, "appletinfotablediv").width(w).height(h);
applet._newCanvas(true);
}
applet._newApplet(viewerOptions);
@@ -13446,7 +13448,7 @@ if (!J2S._version)
// It is possible that these might be loaded dynamically.
// BH 8/6/2018 3.2.2 sets user.home to be "https://./"
-// BH 8/6/2018 3.2.2 adds ?j2squiet option
+// BH 8/6/2018 3.2.2 adds ?j2sverbose option -- lists all files loaded; sets Clazz._quiet = false
// BH 8/5/2018 3.2.2 adds Clazz.newLambda(...)
// BH 8/4/2018 3.2.2 cleans up String $-qualified methods headless and javax tests pass
// BH 8/1/2018 3.2.2 adds default interface methods as C$.$defaults$
@@ -13525,11 +13527,11 @@ window["j2s.clazzloaded"] = true;
*/
/* static */
/*Class = */ Clazz = {
- _isQuiet: false,
+ _isQuiet: true,
_debugging: false,
_loadcore: true,
_nooutput: 0,
- _VERSION: "3.2.2.01",
+ _VERSION: "3.2.2.03",
_VERSION_T: "unknown",
};
@@ -13538,7 +13540,7 @@ window["j2s.clazzloaded"] = true;
try {
Clazz._debugging = (document.location.href.indexOf("j2sdebug") >= 0);
Clazz._loadcore = (document.location.href.indexOf("j2snocore") < 0);
- Clazz._quiet = (document.location.href.indexOf("j2squiet") >= 0);
+ Clazz._quiet = (document.location.href.indexOf("j2sverbose") < 0);
} catch (e) {}
try {