Skip to content

j2sMenu, resizer fixes for method $ #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BobHanson merged 2 commits into from
Aug 7, 2018
Merged

j2sMenu, resizer fixes for method $ #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82681b9
j2sMenu, resizer fixes for method $
Aug 7, 2018
5315d4a
Merge pull request #45 from BobHanson/yadav1
BobHanson Aug 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified sources/net.sf.j2s.core/dist/SwingJS-site.zip
View file
Open in desktop
Binary file not shown.
Binary file modified sources/net.sf.j2s.core/dist/dropins/net.sf.j2s.core.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.core/dist/dropins/timestamp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20180807004156
20180807091649
Binary file modified sources/net.sf.j2s.core/dist/dropins/ver/3.2.2/SwingJS-site.zip
View file
Open in desktop
Binary file not shown.
Binary file modified sources/net.sf.j2s.core/dist/dropins/ver/3.2.2/net.sf.j2s.core.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.core/dist/dropins/ver/3.2.2/timestamp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20180807004156
20180807091649
5 changes: 4 additions & 1 deletion sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
3 changes: 1 addition & 2 deletions sources/net.sf.j2s.java.core/build_core_applet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,11 +292,10 @@
" />
</antcall>

<echo>TODO: Could delete demo html files? </echo>

<echo>creating dist/SwingJS-site.zip </echo>
<zip destfile="dist/SwingJS-site.zip" basedir="site" >
<exclude name="swingjs/j2s/test/**"/>
<exclude name="*.html"/>
</zip>

</target>
Expand Down
Binary file modified sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.java.core/src/swingjs/JSToolkit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
* }
Expand Down
4 changes: 2 additions & 2 deletions sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 3 additions & 1 deletion sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
Expand Down Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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$
Expand Down Expand Up @@ -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",
};

Expand All @@ -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 {
Expand Down
12 changes: 7 additions & 5 deletions sources/net.sf.j2s.java.core/srcjs/swingjs2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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$
Expand Down Expand Up @@ -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",
};

Expand All @@ -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 {
Expand Down