incorporates j2sComboBox, j2sMenu, and J2sSlider into JQueryUI.java

BobHanson · BobHanson · commit 8ba7785255c5 · 2024-06-28T11:18:49.000-05:00
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20240624194514 
+20240627180429 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/5.0.1/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/5.0.1/timestamp
@@ -1 +1 @@
-20240624194514 
+20240627180429 
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/dist_to_jsmol/Jmol-j2s-site.zip b/sources/net.sf.j2s.java.core/dist_to_jsmol/Jmol-j2s-site.zip
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java b/sources/net.sf.j2s.java.core/src/swingjs/JSUtil.java
@@ -456,7 +456,7 @@ static String processCSS(String css, String path) {
 	return css;
 	}
 
-	static String processJS(String js, String resourceName) {
+	public static String processJS(String js, String resourceName) {
 	try {
 		/**
 		 * @j2sNative
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/api/js/J2SInterface.java b/sources/net.sf.j2s.java.core/src/swingjs/api/js/J2SInterface.java
@@ -80,6 +80,12 @@ void readyCallback(String appId, String fullId, boolean isReady,
 
 	JSFunction getCaller();
 
+	void __makeSlider();
+
+	void __makeMenu();
+
+	void __makeComboBox();
+
 
 }
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/jquery/JQueryUI.java b/sources/net.sf.j2s.java.core/src/swingjs/jquery/JQueryUI.java
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sComboBox.js b/sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sComboBox.js
@@ -1,4 +1,10 @@
 /**
+ * THIS FILE IS FOR REFERENCE AND DEBUGGING ONLY
+ * 
+ *  NOTE: If you change this file, copy its contents into 
+ *  its spot at the end of JQueryUI.java. Or, if you are testing
+ *  work here and set JQueryUI.loadResourceInternal = false only while testing,
+ *  then do that paste.
  * 
  * @author Bob Hanson 2019.07.06
  * 
@@ -10,8 +16,6 @@
 
 // BH 2023.11.02 fixed touch issue not causing click -- hidePopup needed a 1-ms timeout
 
-// NOTE: If you change this file, then you need to touch and save JQueryUI.java, as only then
-//       will the transpiler copy this file to site/swingjs/j2s/swingjs/jquery/
 
 ;(function($) {
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sMenu.js b/sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sMenu.js
@@ -1,8 +1,15 @@
+/**
+ *  NOTE: If you change this file, copy its contents into 
+ *  its spot at the end of JQueryUI.java. Or, if you are testing
+ *  work here and set JQueryUI.loadResourceInternal = false only while testing,
+ *  then do that paste.
+ * 
+
+ */
+
 // BH 2023.06.06 no-move menu actuation; adds cursor:pointer to ui-j2s-menu to enable click; adds pointerdown/up; 
 //   see https://stackoverflow.com/questions/3025348/how-do-i-use-jquery-for-click-event-in-iphone-web-application/4910962#4910962
 // based on jQuery UI - v1.9.2 - 2012-12-17
-// NOTE: If you change this file, then you need to touch and save JQueryUI.java, as only then
-//       will the transpiler copy this file to site/swingjs/j2s/swingjs/jquery/
 
 ;(function(Swing, $) {
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sSlider.js b/sources/net.sf.j2s.java.core/src/swingjs/jquery/j2sSlider.js
@@ -1,7 +1,13 @@
+/**
+ *  NOTE: If you change this file, copy its contents into 
+ *  its spot at the end of JQueryUI.java. Or, if you are testing
+ *  work here and set JQueryUI.loadResourceInternal = false only while testing,
+ *  then do that paste.
+ *  
+ */
+
 // based on  jQuery UI - v1.9.2 - 2015-05-28
 
-//NOTE: If you change this file, then you need to touch and save JQueryUI.java, as only then
-//will the transpiler copy this file to site/swingjs/j2s/swingjs/jquery/
 
 ;(function($) {
 	

Original file line number	Diff line number	Diff line change
`@@ -456,7 +456,7 @@ static String processCSS(String css, String path) {`
`456`	`456`	`return css;`
`457`	`457`	`}`
`458`	`458`
`459`		`- static String processJS(String js, String resourceName) {`
	`459`	`+ public static String processJS(String js, String resourceName) {`
`460`	`460`	`try {`
`461`	`461`	`/**`
`462`	`462`	`* @j2sNative`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,12 @@ void readyCallback(String appId, String fullId, boolean isReady,`
`80`	`80`
`81`	`81`	`JSFunction getCaller();`
`82`	`82`
	`83`	`+ void __makeSlider();`
	`84`	`+`
	`85`	`+ void __makeMenu();`
	`86`	`+`
	`87`	`+ void __makeComboBox();`
	`88`	`+`
`83`	`89`
`84`	`90`	`}`
`85`	`91`