Skip to content

Yadav1 #55

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 5 commits into from
Jul 22, 2018
Merged

Yadav1 #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
22860e8
// BH 7/21/2018 fix for static{thisApplet.__Info.width=300} not working
Jul 21, 2018
63010aa
ScrollPane scroll bar upgrade
Jul 21, 2018
4bfacfb
fix for static applet info; scrollpane scroll bar upgrade
Jul 21, 2018
394fd1e
fix for static applet info; scrollpane scroll bar upgrade
Jul 21, 2018
50b0e6c
JScrollBar fixes
Jul 22, 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.java.core/dist/SwingJS-site.zip
View file
Open in desktop
Binary file not shown.
6 changes: 4 additions & 2 deletions sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public static String getJavaResource(String resourceName, boolean isJavaPath,
+ (ok ? "" + sdata.length() : sdata) + "]");
return (!ok ? null : !doProcess ? sdata
: path.endsWith(".css") ? JSUtil.processCSS(sdata, path) : path
.endsWith(".js") ? JSUtil.processJS(sdata) : sdata);
.endsWith(".js") ? JSUtil.processJS(sdata, resourceName) : sdata);
}

static void cacheFileData(String path, Object data) {
Expand Down Expand Up @@ -231,11 +231,13 @@ static String processCSS(String css, String path) {
return css;
}

static String processJS(String js) {
static String processJS(String js, String resourceName) {
try {
/**
* @j2sNative
*
*
* if (js.indexOf(";//# sourceURL=") < 0) js += ";//# sourceURL=" + thisApplet._j2sPath + "/" + resourceName;
* eval(js);
*
*/
Expand Down
26 changes: 0 additions & 26 deletions sources/net.sf.j2s.java.core/src/swingjs/jquery/JQueryUI.js
View file
Open in desktop

This file was deleted.

Loading