Merge branch 'jquery:main' into master

jquery · Aug 2, 2022 · 7e7b325 · 7e7b325
2 parents 8671bcd + 4bae79d
commit 7e7b325
Show file tree

Hide file tree

Showing 139 changed files with 320 additions and 205 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: monthly
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,9 +12,9 @@ jobs:
         node-version: [12.x, 14.x]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -24,7 +24,7 @@ jobs:
           echo "::set-output name=dir::$(npm config get cache)"
 
       - name: Cache npm dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.npm-cache-dir.outputs.dir }}
           key: ${{ runner.os }}-node-${{ matrix.node-version }}-npm-${{ hashFiles('**/package.json') }}

diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -365,3 +365,8 @@ Patrick McKay <patrick.mckay@vumc.org>
 c-lambert <58025159+c-lambert@users.noreply.github.com>
 Josep Sanz <josepsanzcamp@gmail.com>
 Ben Mullins <benm@umich.edu>
+Christian Oliff <christianoliff@pm.me>
+dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
+Adam Lidén Hällgren <adamlh92@gmail.com>
+James Hinderks <hinderks@gmail.com>
+Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing to jQuery UI
 
-Welcome! Thanks for your interest in contributing to jQuery UI. Most of our information on how to contribute to this and all other jQuery Foundation projects is over at [contribute.jquery.org](http://contribute.jquery.org). You'll definitely want to take a look at the articles on contributing [code](http://contribute.jquery.org/code).
+Welcome! Thanks for your interest in contributing to jQuery UI. Most of our information on how to contribute to this and all other jQuery projects is over at [contribute.jquery.org](http://contribute.jquery.org). You'll definitely want to take a look at the articles on contributing [code](http://contribute.jquery.org/code).
 
 You may also want to take a look at our [commit & pull request guide](http://contribute.jquery.org/commits-and-pull-requests/) and [style guides](http://contribute.jquery.org/style-guide/) for instructions on how to maintain your fork and submit your code. Before we can merge any pull request, we'll also need you to sign our [contributor license agreement](http://contribute.jquery.org/cla).
 

diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright jQuery Foundation and other contributors, https://jquery.org/
+Copyright OpenJS Foundation and other contributors, https://openjsf.org/
 
 This software consists of voluntary contributions made by many
 individuals. For exact contribution history, see the revision history

diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,11 @@
+# Security Policy
+
+## Supported Versions
+
+The [latest released version](https://github.com/jquery/jquery-ui/releases) of jQuery UI is supported.
+
+## Reporting a Vulnerability
+
+Please email security@jquery.com, and we will respond as quickly as possible.
+
+If the vulnerability is considered valid and accepted, a patch will be made for the latest jQuery UI version. If the vulnerability is deemed invalid, no further action is required.
diff --git a/demos/button/default.html b/demos/button/default.html
@@ -9,7 +9,7 @@
 	<script src="../../external/requirejs/require.js"></script>
 	<script src="../bootstrap.js">
 		$( ".widget input[type=submit], .widget a, .widget button" ).button();
-		$( "button, input, a" ).click( function( event ) {
+		$( "button, input, a" ).on( "click", function( event ) {
 			event.preventDefault();
 		} );
 	</script>

diff --git a/demos/controlgroup/splitbutton.html b/demos/controlgroup/splitbutton.html
@@ -21,7 +21,7 @@
 			}
 		});
 		$( ".controlgroup" ).controlgroup();
-		$( "button" ).click(function() {
+		$( "button" ).on( "click", function() {
 			$( ".output" ).append( "<li>Running Last Action...</li>" );
 		});
 	</script>

diff --git a/package.json b/package.json
@@ -2,10 +2,10 @@
 	"name": "jquery-ui",
 	"title": "jQuery UI",
 	"description": "A curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library.",
-	"version": "1.13.2-pre",
+	"version": "1.13.3-pre",
 	"homepage": "http://jqueryui.com",
 	"author": {
-		"name": "jQuery Foundation and other contributors",
+		"name": "OpenJS Foundation and other contributors",
 		"url": "https://github.com/jquery/jquery-ui/blob/main/AUTHORS.txt"
 	},
 	"main": "ui/widget.js",
@@ -54,7 +54,7 @@
 		"commitplease": "3.2.0",
 		"eslint-config-jquery": "3.0.0",
 		"glob": "7.2.0",
-		"grunt": "1.4.1",
+		"grunt": "1.5.3",
 		"grunt-bowercopy": "1.2.5",
 		"grunt-cli": "1.4.3",
 		"grunt-compare-size": "0.4.2",

diff --git a/tests/unit/checkboxradio/checkboxradio.html b/tests/unit/checkboxradio/checkboxradio.html
@@ -64,6 +64,18 @@
 <label>
 	<input type="checkbox" id="label-with-no-for"/>
 </label>
+<label>
+	<input type="checkbox" id="label-with-no-for-with-html"/>
+	<strong>Hi</strong>, <em>I'm a label</em>
+</label>
+<label>
+	<input type="checkbox" id="label-with-no-for-with-text"/>
+	Hi, I'm a label
+</label>
+<label>
+	<input type="checkbox" id="label-with-no-for-with-html-like-text"/>
+	&lt;em&gt;Hi, I'm a label&lt;/em&gt;
+</label>
 
 <form id="form3"></form>
 <input type="radio" name="crazy-form" id="crazy-form-1" form="form3" checked="checked">

diff --git a/tests/unit/checkboxradio/core.js b/tests/unit/checkboxradio/core.js
@@ -131,4 +131,41 @@ QUnit.test( "Calling checkboxradio on an input with no label throws an error", f
 	);
 } );
 
+QUnit.test( "Inheriting label from initial HTML", function( assert ) {
+	var tests = [
+		{
+			id: "label-with-no-for-with-html",
+			expectedLabel: "<strong>Hi</strong>, <em>I'm a label</em>"
+		},
+		{
+			id: "label-with-no-for-with-text",
+			expectedLabel: "Hi, I'm a label"
+		},
+		{
+			id: "label-with-no-for-with-html-like-text",
+			expectedLabel: "&lt;em&gt;Hi, I'm a label&lt;/em&gt;"
+		}
+	];
+
+	assert.expect( tests.length );
+
+	tests.forEach( function( testData ) {
+		var id = testData.id;
+		var expectedLabel = testData.expectedLabel;
+		var inputElem = $( "#" + id );
+		var labelElem = inputElem.parent();
+
+		inputElem.checkboxradio( { icon: false } );
+
+		var labelWithoutInput = labelElem.clone();
+		labelWithoutInput.find( "input" ).remove();
+
+		assert.strictEqual(
+			labelWithoutInput.html().trim(),
+			expectedLabel.trim(),
+			"Label correct [" + id + "]"
+		);
+	} );
+} );
+
 } );
diff --git a/tests/unit/checkboxradio/methods.js b/tests/unit/checkboxradio/methods.js
@@ -96,4 +96,42 @@ QUnit.test( "Input wrapped in a label preserved on refresh", function( assert )
 	assert.strictEqual( input.parent()[ 0 ], element[ 0 ], "Input preserved" );
 } );
 
+QUnit.test( "Initial text label not turned to HTML on refresh", function( assert ) {
+	var tests = [
+		{
+			id: "label-with-no-for-with-html",
+			expectedLabel: "<strong>Hi</strong>, <em>I'm a label</em>"
+		},
+		{
+			id: "label-with-no-for-with-text",
+			expectedLabel: "Hi, I'm a label"
+		},
+		{
+			id: "label-with-no-for-with-html-like-text",
+			expectedLabel: "&lt;em&gt;Hi, I'm a label&lt;/em&gt;"
+		}
+	];
+
+	assert.expect( tests.length );
+
+	tests.forEach( function( testData ) {
+		var id = testData.id;
+		var expectedLabel = testData.expectedLabel;
+		var inputElem = $( "#" + id );
+		var labelElem = inputElem.parent();
+
+		inputElem.checkboxradio( { icon: false } );
+		inputElem.checkboxradio( "refresh" );
+
+		var labelWithoutInput = labelElem.clone();
+		labelWithoutInput.find( "input" ).remove();
+
+		assert.strictEqual(
+			labelWithoutInput.html().trim(),
+			expectedLabel.trim(),
+			"Label correct [" + id + "]"
+		);
+	} );
+} );
+
 } );
diff --git a/tests/visual/checkboxradio/checkboxradio.html b/tests/visual/checkboxradio/checkboxradio.html
@@ -24,7 +24,7 @@
 				checkboxes.checkboxradio( "option", option, value );
 			}
 		});
-		$( ".controls > button" ).click( function() {
+		$( ".controls > button" ).on( "click", function() {
 			if ( this.id !== "create" ) {
 				checkboxes.checkboxradio( this.id );
 			} else {

diff --git a/themes/base/accordion.css b/themes/base/accordion.css
@@ -2,7 +2,7 @@
  * jQuery UI Accordion @VERSION
  * http://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

diff --git a/themes/base/all.css b/themes/base/all.css
@@ -2,7 +2,7 @@
  * jQuery UI CSS Framework @VERSION
  * http://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

diff --git a/themes/base/autocomplete.css b/themes/base/autocomplete.css
@@ -2,7 +2,7 @@
  * jQuery UI Autocomplete @VERSION
  * http://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

diff --git a/themes/base/base.css b/themes/base/base.css
@@ -2,7 +2,7 @@
  * jQuery UI CSS Framework @VERSION
  * http://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

diff --git a/themes/base/button.css b/themes/base/button.css
@@ -2,7 +2,7 @@
  * jQuery UI Button @VERSION
  * http://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

diff --git a/themes/base/checkboxradio.css b/themes/base/checkboxradio.css
@@ -2,7 +2,7 @@
  * jQuery UI Checkboxradio @VERSION
  * http://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

diff --git a/themes/base/controlgroup.css b/themes/base/controlgroup.css
@@ -2,7 +2,7 @@
  * jQuery UI Controlgroup @VERSION
  * http://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

diff --git a/themes/base/core.css b/themes/base/core.css
@@ -2,7 +2,7 @@
  * jQuery UI CSS Framework @VERSION
  * http://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

diff --git a/themes/base/datepicker.css b/themes/base/datepicker.css
@@ -2,7 +2,7 @@
  * jQuery UI Datepicker @VERSION
  * http://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

diff --git a/themes/base/dialog.css b/themes/base/dialog.css
@@ -2,7 +2,7 @@
  * jQuery UI Dialog @VERSION
  * http://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

diff --git a/themes/base/draggable.css b/themes/base/draggable.css
@@ -2,7 +2,7 @@
  * jQuery UI Draggable @VERSION
  * http://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  */

diff --git a/themes/base/menu.css b/themes/base/menu.css
@@ -2,7 +2,7 @@
  * jQuery UI Menu @VERSION
  * http://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

diff --git a/themes/base/progressbar.css b/themes/base/progressbar.css
@@ -2,7 +2,7 @@
  * jQuery UI Progressbar @VERSION
  * http://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

diff --git a/themes/base/resizable.css b/themes/base/resizable.css
@@ -2,7 +2,7 @@
  * jQuery UI Resizable @VERSION
  * http://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  */

diff --git a/themes/base/selectable.css b/themes/base/selectable.css
@@ -2,7 +2,7 @@
  * jQuery UI Selectable @VERSION
  * http://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  */

diff --git a/themes/base/selectmenu.css b/themes/base/selectmenu.css
@@ -2,7 +2,7 @@
  * jQuery UI Selectmenu @VERSION
  * http://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

diff --git a/themes/base/slider.css b/themes/base/slider.css
@@ -2,7 +2,7 @@
  * jQuery UI Slider @VERSION
  * http://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

diff --git a/themes/base/sortable.css b/themes/base/sortable.css
@@ -2,7 +2,7 @@
  * jQuery UI Sortable @VERSION
  * http://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  */

diff --git a/themes/base/spinner.css b/themes/base/spinner.css
@@ -2,7 +2,7 @@
  * jQuery UI Spinner @VERSION
  * http://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

diff --git a/themes/base/tabs.css b/themes/base/tabs.css
@@ -2,7 +2,7 @@
  * jQuery UI Tabs @VERSION
  * http://jqueryui.com
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *