Skip to content

Commit fb9df5d

Browse files
hansonrhansonr
authored andcommitted
j2smenu
1 parent 2b8bbd5 commit fb9df5d

File tree

4 files changed

+693
-691
lines changed

4 files changed

+693
-691
lines changed

sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1558,7 +1558,7 @@ if (!target) {
15581558

15591559
J2S.$bind(who, 'click', function(ev) {
15601560
if (J2S._traceMouse)
1561-
J2S.traceMouse("CLICK " + ev.originalEvent.detail, ev);
1561+
J2S.traceMouse("CLICK", ev);
15621562

15631563
if (doIgnore(ev))
15641564
return true;
@@ -1571,7 +1571,7 @@ if (!target) {
15711571
if (!xym)
15721572
return false;
15731573
who.applet._processEvent(500, xym, ev, who._frameViewer);// MouseEvent.MOUSE_CLICK
1574-
return false;
1574+
return true; // was false
15751575
});
15761576

15771577
J2S.$bind(who, 'DOMMouseScroll mousewheel', function(ev) { // Zoom

sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ try {
6767
try {
6868
// will alert in system.out.println with a message
6969
Clazz._traceOutput =
70-
(document.location.href.indexOf("j2strace=") >= 0 ? document.location.href.split("j2strace=")[1].split("&")[0] : null)
70+
(document.location.href.indexOf("j2strace=") >= 0 ? decodeURI(document.location.href.split("j2strace=")[1].split("&")[0]) : null);
71+
Clazz._traceFilter =
72+
(document.location.href.indexOf("j2sfilter=") >= 0 ? decodeURI(document.location.href.split("j2sfilter=")[1].split("&")[0]) : null);
7173
} catch (e) {}
7274

7375
Clazz.setTVer = function(ver) {
@@ -3267,12 +3269,9 @@ Sys.out.printf = Sys.out.printf$S$OA = Sys.out.format = Sys.out.format$S$OA = fu
32673269
Sys.out.flush$ = function() {}
32683270

32693271
Sys.out.println = Sys.out.println$O = Sys.out.println$Z = Sys.out.println$I = Sys.out.println$J = Sys.out.println$S = Sys.out.println$C = Sys.out.println = function(s) {
3270-
3271-
if (("" + s).indexOf("TypeError") >= 0) {
3272-
doDebugger();
3273-
}
3274-
if (Clazz._nooutput) return;
3275-
if (Clazz._traceOutput && s && ("" + s).indexOf(Clazz._traceOutput) >= 0) {
3272+
s = (typeof s == "undefined" ? "" : "" + s);
3273+
if (Clazz._nooutput || Clazz._traceFilter && s.indexOf(Clazz._traceFilter) < 0) return;
3274+
if (!Clazz._traceFilter && Clazz._traceOutput && s && (s.indexOf(Clazz._traceOutput) >= 0 || '"' + s + '"' == Clazz._traceOutput)) {
32763275
alert(s + "\n\n" + Clazz._getStackTrace());
32773276
doDebugger();
32783277
}

0 commit comments

Comments
 (0)