Skip to content

Commit 4182796

Browse files
hansonrhansonr
authored andcommitted
j2sApplet update for URL POST connection
1 parent fbbfec7 commit 4182796

File tree

6 files changed

+15
-12
lines changed

6 files changed

+15
-12
lines changed
-138 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20190516072939
1+
20190516082613
-138 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20190516072939
1+
20190516082613
29 Bytes
Binary file not shown.

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11706,11 +11706,14 @@ console.log("J2S._getRawDataFromServer " + J2S._serverUrl + " for " + query);
1170611706
if (dataOut) {
1170711707
if (url.indexOf("http://") != 0 && url.indexOf("https://") != 0)
1170811708
return J2S.saveFile(url, dataOut);
11709-
var info = {async:false,url:url,type:"POST", processData:false,
11710-
data:(typeof data == "string" ? dataOut
11711-
: ";base64," + Clazz.load("javajs.util.Base64").getBase64$BA(dataOut).toString())
11712-
};
11713-
return J2S.$ajax(info).responseText;
11709+
info.async = false;
11710+
info.url = url;
11711+
info.type = "POST";
11712+
info.processData = false;
11713+
info.data = (typeof data == "string" ? dataOut
11714+
: ";base64," + Clazz.load("javajs.util.Base64").getBase64$BA(dataOut).toString());
11715+
info.xhr = J2S.$ajax(info);
11716+
return info.xhr.responseText;
1171411717
}
1171511718
if (postOut)
1171611719
url += "?POST?" + postOut;
@@ -12952,20 +12955,20 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
1295212955
};
1295312956

1295412957
J2S._setAppletParams = function(availableParams, params, Info, isHashtable) {
12955-
for ( var i in Info)
12958+
for (var i in Info) {
12959+
var lci = i.toLowerCase();
1295612960
if (!availableParams
12957-
|| availableParams.indexOf(";" + i.toLowerCase() + ";") >= 0) {
12958-
if (Info[i] == null || i == "language"
12961+
|| availableParams.indexOf(";" + lci + ";") >= 0) {
12962+
if (Info[i] == null || lci == "language"
1295912963
&& !J2S.featureDetection.supportsLocalization())
1296012964
continue;
12961-
// params.put$TK$TV(i, (Info[i] === true ? Boolean.TRUE: Info[i]
12962-
// === false ? Boolean.FALSE : Info[i]))
1296312965
if (isHashtable)
1296412966
params.put$TK$TV(i, (Info[i] === true ? Boolean.TRUE
1296512967
: Info[i] === false ? Boolean.FALSE : Info[i]))
1296612968
else
1296712969
params[i] = Info[i];
1296812970
}
12971+
}
1296912972
}
1297012973

1297112974
// The original Jmol "applet" was created as an

0 commit comments

Comments
 (0)