Skip to content

Commit 7f622b4

Browse files
hansonrhansonr
authored andcommitted
applet._j2sFullPath; readyCallback overwrites _appletPanel
1 parent 2f8e706 commit 7f622b4

File tree

7 files changed

+6
-5
lines changed

7 files changed

+6
-5
lines changed
291 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20201214212409
1+
20201215092141
291 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20201214212409
1+
20201215092141
291 Bytes
Binary file not shown.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1356,8 +1356,9 @@ if (database == "_" && J2S._serverUrl.indexOf("//your.server.here/") >= 0) {
13561356
// necessary for MSIE in strict mode -- apparently, we can't call
13571357
// J2S.readyCallback, but we can call J2S.readyCallback. Go figure...
13581358
if (isReady) {
1359-
// when leaving page, Java applet may be dead
1359+
// applet._appletPanel is set in SwingJSApplet upon creation
13601360
applet._appletPanel || (applet._appletPanel = (javaAppletPanel || javaApplet));
1361+
// when leaving page, Java applet may be dead
13611362
applet._applet = javaApplet;
13621363
!applet.getApp && (applet.getApp = function(){ applet._setThread();return javaApplet });
13631364
J2S.$css(J2S.$(applet, 'appletdiv'), { 'background-image': '' });

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12028,7 +12028,7 @@ if (database == "_" && J2S._serverUrl.indexOf("//your.server.here/") >= 0) {
1202812028
// J2S.readyCallback, but we can call J2S.readyCallback. Go figure...
1202912029
if (isReady) {
1203012030
// when leaving page, Java applet may be dead
12031-
applet._appletPanel = (javaAppletPanel || javaApplet);
12031+
applet._appletPanel || (applet._appletPanel = (javaAppletPanel || javaApplet));
1203212032
applet._applet = javaApplet;
1203312033
!applet.getApp && (applet.getApp = function(){ applet._setThread();return javaApplet });
1203412034
J2S.$css(J2S.$(applet, 'appletdiv'), { 'background-image': '' });
@@ -13451,7 +13451,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
1345113451
base[base.length - 1] = codePath;
1345213452
codePath = base.join("/");
1345313453
}
13454-
applet._j2sFullPath = codePath.substring(0, codePath.length);
13454+
applet._j2sFullPath = codePath.substring(0, codePath.length - 1);
1345513455
if (applet.__Info.code)
1345613456
codePath += applet.__Info.code.replace(/\./g, "/");
1345713457
codePath = codePath.substring(0,

0 commit comments

Comments
 (0)