Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
update - JSTempFile, java.nio, java.jar
  • Loading branch information
hansonr hansonr
hansonr authored and hansonr committed Aug 23, 2018
commit 005eadebeda1b19ae50ef032a242bacd2493bca3
Binary file modified sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.core/dist/swingjs/timestamp
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20180823081141
20180823095007
Binary file modified sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/SwingJS-site.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/timestamp
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20180823081141
20180823095007
Binary file modified sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
Binary file not shown.
9 changes: 6 additions & 3 deletions sources/net.sf.j2s.java.core/srcjs/swingjs2.js
Original file line number Diff line number Diff line change
Expand Up @@ -11495,8 +11495,11 @@ if (!J2S._version)

J2S._isDirectCall = function(url) {
for ( var key in J2S.db._DirectDatabaseCalls) {
if (key.indexOf(".") >= 0 && url.indexOf(key) >= 0)
return true;
if (key.indexOf(".") >= 0 && url.indexOf(key) >= 0) {
// hack because ebi is not returning ajax calls
return url.indexOf(".ebi.ac.") < 0 || url.indexOf("dbfetch/dbfetch") < 0;

}
}
return false;
}
Expand Down Expand Up @@ -17907,7 +17910,7 @@ var s=this;
if(arguments.length==1){
var cs=arguments[0].toString().toLowerCase();
var charset=[
"utf-8","UTF8","us-ascii","iso-8859-1","8859_1","gb2312","gb18030","gbk"
"utf-8","utf8","us-ascii","iso-8859-1","8859_1","gb2312","gb18030","gbk"
];
var existed=false;
for(var i=0;i<charset.length;i++){
Expand Down