Skip to content

final menu work #89

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 3 commits into from
Nov 21, 2018
Merged

final menu work #89

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
009b70d
final menus tweak -- no outjmol binding
Nov 21, 2018
09f29a1
final menus tweak -- no outjmol binding
Nov 21, 2018
acfe30b
Merge pull request #70 from BobHanson/hanson1
BobHanson Nov 21, 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
Next Next commit
final menus tweak -- no outjmol binding
  • Loading branch information
hansonr authored and hansonr committed Nov 21, 2018
commit 009b70dc3e50f38245f393a261ba80fae28e3600
12 changes: 6 additions & 6 deletions 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 @@ -255,12 +255,12 @@ Swing.showMenu = function(menu, x, y) {
menu._visible = true;
menu.timestamp = System.currentTimeMillis$();
menu.dragBind(true);
menu.$ulTop.unbind('clickoutjsmol mousemoveoutjsmol');
if (!J2S._persistentMenu)
menu.$ulTop.bind('clickoutjsmol mousemoveoutjsmol', function(evspecial, target, ev) {
if (System.currentTimeMillis$() - menu.timestamp > 500)
Swing.hideMenu(menu);
});
// menu.$ulTop.unbind('clickoutjsmol mousemoveoutjsmol');
// if (!J2S._persistentMenu)
// menu.$ulTop.bind('clickoutjsmol mousemoveoutjsmol', function(evspecial, target, ev) {
// if (System.currentTimeMillis$() - menu.timestamp > 500)
// Swing.hideMenu(menu);
// });
menu.$ulTop.bind("contextmenu", function() {return false;});
}

Expand Down