Skip to content

various fixes #46

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 1 commit into from
Aug 7, 2018
Merged

various fixes #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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.core/dist/SwingJS-site.zip
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.core/dist/dropins/timestamp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20180807091649
20180807100156
Binary file modified sources/net.sf.j2s.core/dist/dropins/ver/3.2.2/SwingJS-site.zip
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.core/dist/dropins/ver/3.2.2/timestamp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20180807091649
20180807100156
Binary file modified sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.java.core/src/javax/swing/DefaultRowSorter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,7 +1390,7 @@ public I getIdentifier() {
*/
// NOTE: this class is static so that it can be placed in an array
private static class Row implements Comparable<Row> {
private DefaultRowSorter sorter;
DefaultRowSorter sorter;
int modelIndex;

public Row(DefaultRowSorter sorter, int index) {
Expand Down
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ Swing.showMenu = function(menu, x, y) {
menu.$ulTop.unbind('clickoutjsmol mousemoveoutjsmol');
if (!J2S._persistentMenu)
menu.$ulTop.bind('clickoutjsmol mousemoveoutjsmol', function(evspecial, target, ev) {
if (System.currentTimeMillis() - menu.timestamp > 1000)
if (System.currentTimeMillis$() - menu.timestamp > 1000)
Swing.hideMenu(menu);
});
menu.$ulTop.bind("contextmenu", function() {return false;});
Expand Down
4 changes: 3 additions & 1 deletion sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2939,9 +2939,11 @@ java.lang.System = System = {
v = "50";
break;
case "user.home":
v = "https:/./";
v = "https://./";
break;
case "java.vendor":
v = "SwingJS/OpenJDK";
break;
case "java.version":
v = "1.6-1.8";
break;
Expand Down
4 changes: 3 additions & 1 deletion sources/net.sf.j2s.java.core/srcjs/swingjs2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16376,9 +16376,11 @@ java.lang.System = System = {
v = "50";
break;
case "user.home":
v = "https:/./";
v = "https://./";
break;
case "java.vendor":
v = "SwingJS/OpenJDK";
break;
case "java.version":
v = "1.6-1.8";
break;
Expand Down