Skip to content

Commit c698d7e

Browse files
committed
updated j2sMenu,Slider,ComboBox
1 parent 0b8eff5 commit c698d7e

File tree

8 files changed

+818
-819
lines changed

8 files changed

+818
-819
lines changed
1.56 KB
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20200125072913
1+
20200125163539
1.56 KB
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20200125072913
1+
20200125163539
1.56 KB
Binary file not shown.

sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sComboBox.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
// NOTE: If you change this file, then you need to touch and save JQueryUI.java, as only then
1111
// will the transpiler copy this file to site/swingjs/j2s/swingjs/jquery/
1212

13+
;(function($) {
1314

1415
J2S.__makeComboBox = function() {
1516
J2S.__makeComboBox = function(){};
16-
;(function($) {
1717

1818
$( function() {
1919
$('head').append('<style>.j2scb-sel {background-color:#B8CFE5;}'
@@ -303,7 +303,7 @@ J2S.__makeComboBox = function() {
303303
});
304304

305305
});
306-
307-
})(J2S.__$);
308306

309307
};
308+
309+
})(J2S.__$);

sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sMenu.js

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@
22
// NOTE: If you change this file, then you need to touch and save JQueryUI.java, as only then
33
// will the transpiler copy this file to site/swingjs/j2s/swingjs/jquery/
44

5-
J2S.__makeMenu = function() {
5+
;(function(Swing, $) {
66

7+
J2S.__makeMenu = function() {
8+
// run once; set to NOP
79
J2S.__makeMenu = function(){};
810

9-
;(function(Swing) {
10-
1111
var outActive;
1212
var vart;
1313

14-
;(function($) {
15-
16-
1714
var n=!1, e = $;
1815

1916
// local methods here for help with debugging
@@ -633,7 +630,7 @@ Swing.hideMenu = function(menu, force) {
633630
menu.dragBind(false);
634631
menu.$ulTop.hide();
635632
menu._visible = menu.isDragging = false;
636-
};
633+
}
637634

638635
Swing.disposeMenu = function(menu) {
639636
// called by javajs.swing.JPopupMenu
@@ -650,8 +647,9 @@ Swing.disposeMenu = function(menu) {
650647
}
651648

652649

653-
})(J2S.__$);
650+
};
651+
652+
})(J2S.Swing, J2S.__$);
654653

655-
})(J2S.Swing);
656654

657-
}
655+
// end of j2sMenu.js 2020.01.25

0 commit comments

Comments
 (0)