fix for static applet info; scrollpane scroll bar upgrade

hansonr · hansonr · commit 394fd1e228a4 · 2018-07-21T14:26:44.000-05:00
// BH 7/21/2018 fix for static{thisApplet.__Info.width=300} not working
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js
@@ -2325,7 +2325,7 @@ if (!J2S._version)
 						viewerOptions.put("display", applet._id + "_canvas2d");
 					var w = applet.__Info.width;
 					var h = applet.__Info.height;
-					if (w > 0 && h > 0 && (w != applet._canvas.width
+					if (applet._canvas && w > 0 && h > 0 && (w != applet._canvas.width
 							|| h != applet._canvas.height)) {
 						// developer has used static { thisApplet.__Info.width=...}
 						J2S.$(applet, "appletdiv").width(w).height(h);
diff --git a/sources/net.sf.j2s.java.core/srcjs/swingjs2.js b/sources/net.sf.j2s.java.core/srcjs/swingjs2.js
@@ -12979,7 +12979,7 @@ if (!J2S._version)
 						viewerOptions.put("display", applet._id + "_canvas2d");
 					var w = applet.__Info.width;
 					var h = applet.__Info.height;
-					if (w > 0 && h > 0 && (w != applet._canvas.width
+					if (applet._canvas && w > 0 && h > 0 && (w != applet._canvas.width
 							|| h != applet._canvas.height)) {
 						// developer has used static { thisApplet.__Info.width=...}
 						J2S.$(applet, "appletdiv").width(w).height(h);
