Skip to content

Commit 5315d4a

Browse files
authored
Merge pull request #45 from BobHanson/yadav1
j2sMenu, resizer fixes for method $
2 parents 84fc9aa + 82681b9 commit 5315d4a

File tree

14 files changed

+24
-18
lines changed

14 files changed

+24
-18
lines changed
-57.2 KB
Binary file not shown.
14 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20180807004156
1+
20180807091649
-57.2 KB
Binary file not shown.
14 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20180807004156
1+
20180807091649

sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6324,8 +6324,11 @@ private static boolean addJ2SSourceForTag(StringBuffer buffer, TagElement tag, b
63246324
// end with 0 && to replace a number with 0.
63256325
// end with null && to replace anything with null
63266326
// end with 1?xxx: to replace anything with xxx
6327+
// /** @j2sNatve ! */true
6328+
// (/** @j2sNative 1?x: */y)
6329+
// /** @j2sNative true || */javaOnly()
63276330

6328-
boolean isInline = code.endsWith("|") || code.endsWith("&") || code.endsWith(":");
6331+
boolean isInline = code.endsWith("|") || code.endsWith("&") || code.endsWith(":") || code.endsWith("!");
63296332
buffer.append(isInline ? "" : addPrefix ? "{\r\n" : "\r\n");
63306333
buffer.append(code);
63316334
buffer.append(isInline ? "" : addPostfix ? "\r\n}\r\n" : "\r\n");

sources/net.sf.j2s.java.core/build_core_applet.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,11 +292,10 @@
292292
" />
293293
</antcall>
294294

295-
<echo>TODO: Could delete demo html files? </echo>
296-
297295
<echo>creating dist/SwingJS-site.zip </echo>
298296
<zip destfile="dist/SwingJS-site.zip" basedir="site" >
299297
<exclude name="swingjs/j2s/test/**"/>
298+
<exclude name="*.html"/>
300299
</zip>
301300

302301
</target>
-57.2 KB
Binary file not shown.

sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ public static int dispatch(Object f, int msDelay, int id) {
395395
* f();
396396
* } catch (e) {
397397
* var s = "JSToolkit.dispatch$I(" + id +"): "
398-
* + e + "\n" + (e.getStackTrace$ ? e.getStackTrac$e() + "\n" : "") + (!!e.stack ? e.stack : "");
398+
* + e + "\n" + (e.getStackTrace$ ? e.getStackTrace$() + "\n" : "") + (!!e.stack ? e.stack : "");
399399
* System.out.println(s);
400400
* alert(s);
401401
* }

0 commit comments

Comments
 (0)