Skip to content

Commit 7e7b325

Browse files
upluswareuplusware
authored
Merge branch 'jquery:main' into master
2 parents 8671bcd + 4bae79d commit 7e7b325

File tree

139 files changed

+320
-205
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+320
-205
lines changed

‎.github/dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: github-actions
4+
directory: "/"
5+
schedule:
6+
interval: monthly

‎.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
node-version: [12.x, 14.x]
1313

1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616

17-
- uses: actions/setup-node@v1
17+
- uses: actions/setup-node@v3
1818
with:
1919
node-version: ${{ matrix.node-version }}
2020

@@ -24,7 +24,7 @@ jobs:
2424
echo "::set-output name=dir::$(npm config get cache)"
2525
2626
- name: Cache npm dependencies
27-
uses: actions/cache@v2
27+
uses: actions/cache@v3
2828
with:
2929
path: ${{ steps.npm-cache-dir.outputs.dir }}
3030
key: ${{ runner.os }}-node-${{ matrix.node-version }}-npm-${{ hashFiles('**/package.json') }}

‎AUTHORS.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,3 +365,8 @@ Patrick McKay <patrick.mckay@vumc.org>
365365
c-lambert <58025159+c-lambert@users.noreply.github.com>
366366
Josep Sanz <josepsanzcamp@gmail.com>
367367
Ben Mullins <benm@umich.edu>
368+
Christian Oliff <christianoliff@pm.me>
369+
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
370+
Adam Lidén Hällgren <adamlh92@gmail.com>
371+
James Hinderks <hinderks@gmail.com>
372+
Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com>

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Contributing to jQuery UI
22

3-
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).
3+
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).
44

55
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).
66

‎LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright jQuery Foundation and other contributors, https://jquery.org/
1+
Copyright OpenJS Foundation and other contributors, https://openjsf.org/
22

33
This software consists of voluntary contributions made by many
44
individuals. For exact contribution history, see the revision history

‎SECURITY.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Security Policy
2+
3+
## Supported Versions
4+
5+
The [latest released version](https://github.com/jquery/jquery-ui/releases) of jQuery UI is supported.
6+
7+
## Reporting a Vulnerability
8+
9+
Please email security@jquery.com, and we will respond as quickly as possible.
10+
11+
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.

‎demos/button/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<script src="../../external/requirejs/require.js"></script>
1010
<script src="../bootstrap.js">
1111
$( ".widget input[type=submit], .widget a, .widget button" ).button();
12-
$( "button, input, a" ).click( function( event ) {
12+
$( "button, input, a" ).on( "click", function( event ) {
1313
event.preventDefault();
1414
} );
1515
</script>

‎demos/controlgroup/splitbutton.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}
2222
});
2323
$( ".controlgroup" ).controlgroup();
24-
$( "button" ).click(function() {
24+
$( "button" ).on( "click", function() {
2525
$( ".output" ).append( "<li>Running Last Action...</li>" );
2626
});
2727
</script>

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"name": "jquery-ui",
33
"title": "jQuery UI",
44
"description": "A curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library.",
5-
"version": "1.13.2-pre",
5+
"version": "1.13.3-pre",
66
"homepage": "http://jqueryui.com",
77
"author": {
8-
"name": "jQuery Foundation and other contributors",
8+
"name": "OpenJS Foundation and other contributors",
99
"url": "https://github.com/jquery/jquery-ui/blob/main/AUTHORS.txt"
1010
},
1111
"main": "ui/widget.js",
@@ -54,7 +54,7 @@
5454
"commitplease": "3.2.0",
5555
"eslint-config-jquery": "3.0.0",
5656
"glob": "7.2.0",
57-
"grunt": "1.4.1",
57+
"grunt": "1.5.3",
5858
"grunt-bowercopy": "1.2.5",
5959
"grunt-cli": "1.4.3",
6060
"grunt-compare-size": "0.4.2",

‎tests/unit/checkboxradio/checkboxradio.html

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,18 @@
6464
<label>
6565
<input type="checkbox" id="label-with-no-for"/>
6666
</label>
67+
<label>
68+
<input type="checkbox" id="label-with-no-for-with-html"/>
69+
<strong>Hi</strong>, <em>I'm a label</em>
70+
</label>
71+
<label>
72+
<input type="checkbox" id="label-with-no-for-with-text"/>
73+
Hi, I'm a label
74+
</label>
75+
<label>
76+
<input type="checkbox" id="label-with-no-for-with-html-like-text"/>
77+
&lt;em&gt;Hi, I'm a label&lt;/em&gt;
78+
</label>
6779

6880
<form id="form3"></form>
6981
<input type="radio" name="crazy-form" id="crazy-form-1" form="form3" checked="checked">

‎tests/unit/checkboxradio/core.js

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,4 +131,41 @@ QUnit.test( "Calling checkboxradio on an input with no label throws an error", f
131131
);
132132
} );
133133

134+
QUnit.test( "Inheriting label from initial HTML", function( assert ) {
135+
var tests = [
136+
{
137+
id: "label-with-no-for-with-html",
138+
expectedLabel: "<strong>Hi</strong>, <em>I'm a label</em>"
139+
},
140+
{
141+
id: "label-with-no-for-with-text",
142+
expectedLabel: "Hi, I'm a label"
143+
},
144+
{
145+
id: "label-with-no-for-with-html-like-text",
146+
expectedLabel: "&lt;em&gt;Hi, I'm a label&lt;/em&gt;"
147+
}
148+
];
149+
150+
assert.expect( tests.length );
151+
152+
tests.forEach( function( testData ) {
153+
var id = testData.id;
154+
var expectedLabel = testData.expectedLabel;
155+
var inputElem = $( "#" + id );
156+
var labelElem = inputElem.parent();
157+
158+
inputElem.checkboxradio( { icon: false } );
159+
160+
var labelWithoutInput = labelElem.clone();
161+
labelWithoutInput.find( "input" ).remove();
162+
163+
assert.strictEqual(
164+
labelWithoutInput.html().trim(),
165+
expectedLabel.trim(),
166+
"Label correct [" + id + "]"
167+
);
168+
} );
169+
} );
170+
134171
} );

‎tests/unit/checkboxradio/methods.js

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,42 @@ QUnit.test( "Input wrapped in a label preserved on refresh", function( assert )
9696
assert.strictEqual( input.parent()[ 0 ], element[ 0 ], "Input preserved" );
9797
} );
9898

99+
QUnit.test( "Initial text label not turned to HTML on refresh", function( assert ) {
100+
var tests = [
101+
{
102+
id: "label-with-no-for-with-html",
103+
expectedLabel: "<strong>Hi</strong>, <em>I'm a label</em>"
104+
},
105+
{
106+
id: "label-with-no-for-with-text",
107+
expectedLabel: "Hi, I'm a label"
108+
},
109+
{
110+
id: "label-with-no-for-with-html-like-text",
111+
expectedLabel: "&lt;em&gt;Hi, I'm a label&lt;/em&gt;"
112+
}
113+
];
114+
115+
assert.expect( tests.length );
116+
117+
tests.forEach( function( testData ) {
118+
var id = testData.id;
119+
var expectedLabel = testData.expectedLabel;
120+
var inputElem = $( "#" + id );
121+
var labelElem = inputElem.parent();
122+
123+
inputElem.checkboxradio( { icon: false } );
124+
inputElem.checkboxradio( "refresh" );
125+
126+
var labelWithoutInput = labelElem.clone();
127+
labelWithoutInput.find( "input" ).remove();
128+
129+
assert.strictEqual(
130+
labelWithoutInput.html().trim(),
131+
expectedLabel.trim(),
132+
"Label correct [" + id + "]"
133+
);
134+
} );
135+
} );
136+
99137
} );

‎tests/visual/checkboxradio/checkboxradio.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
checkboxes.checkboxradio( "option", option, value );
2525
}
2626
});
27-
$( ".controls > button" ).click( function() {
27+
$( ".controls > button" ).on( "click", function() {
2828
if ( this.id !== "create" ) {
2929
checkboxes.checkboxradio( this.id );
3030
} else {

‎themes/base/accordion.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jQuery UI Accordion @VERSION
33
* http://jqueryui.com
44
*
5-
* Copyright jQuery Foundation and other contributors
5+
* Copyright OpenJS Foundation and other contributors
66
* Released under the MIT license.
77
* http://jquery.org/license
88
*

‎themes/base/all.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jQuery UI CSS Framework @VERSION
33
* http://jqueryui.com
44
*
5-
* Copyright jQuery Foundation and other contributors
5+
* Copyright OpenJS Foundation and other contributors
66
* Released under the MIT license.
77
* http://jquery.org/license
88
*

‎themes/base/autocomplete.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jQuery UI Autocomplete @VERSION
33
* http://jqueryui.com
44
*
5-
* Copyright jQuery Foundation and other contributors
5+
* Copyright OpenJS Foundation and other contributors
66
* Released under the MIT license.
77
* http://jquery.org/license
88
*

‎themes/base/base.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jQuery UI CSS Framework @VERSION
33
* http://jqueryui.com
44
*
5-
* Copyright jQuery Foundation and other contributors
5+
* Copyright OpenJS Foundation and other contributors
66
* Released under the MIT license.
77
* http://jquery.org/license
88
*

‎themes/base/button.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jQuery UI Button @VERSION
33
* http://jqueryui.com
44
*
5-
* Copyright jQuery Foundation and other contributors
5+
* Copyright OpenJS Foundation and other contributors
66
* Released under the MIT license.
77
* http://jquery.org/license
88
*

‎themes/base/checkboxradio.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jQuery UI Checkboxradio @VERSION
33
* http://jqueryui.com
44
*
5-
* Copyright jQuery Foundation and other contributors
5+
* Copyright OpenJS Foundation and other contributors
66
* Released under the MIT license.
77
* http://jquery.org/license
88
*

‎themes/base/controlgroup.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jQuery UI Controlgroup @VERSION
33
* http://jqueryui.com
44
*
5-
* Copyright jQuery Foundation and other contributors
5+
* Copyright OpenJS Foundation and other contributors
66
* Released under the MIT license.
77
* http://jquery.org/license
88
*

‎themes/base/core.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jQuery UI CSS Framework @VERSION
33
* http://jqueryui.com
44
*
5-
* Copyright jQuery Foundation and other contributors
5+
* Copyright OpenJS Foundation and other contributors
66
* Released under the MIT license.
77
* http://jquery.org/license
88
*

‎themes/base/datepicker.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jQuery UI Datepicker @VERSION
33
* http://jqueryui.com
44
*
5-
* Copyright jQuery Foundation and other contributors
5+
* Copyright OpenJS Foundation and other contributors
66
* Released under the MIT license.
77
* http://jquery.org/license
88
*

‎themes/base/dialog.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jQuery UI Dialog @VERSION
33
* http://jqueryui.com
44
*
5-
* Copyright jQuery Foundation and other contributors
5+
* Copyright OpenJS Foundation and other contributors
66
* Released under the MIT license.
77
* http://jquery.org/license
88
*

‎themes/base/draggable.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jQuery UI Draggable @VERSION
33
* http://jqueryui.com
44
*
5-
* Copyright jQuery Foundation and other contributors
5+
* Copyright OpenJS Foundation and other contributors
66
* Released under the MIT license.
77
* http://jquery.org/license
88
*/

‎themes/base/menu.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jQuery UI Menu @VERSION
33
* http://jqueryui.com
44
*
5-
* Copyright jQuery Foundation and other contributors
5+
* Copyright OpenJS Foundation and other contributors
66
* Released under the MIT license.
77
* http://jquery.org/license
88
*

‎themes/base/progressbar.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jQuery UI Progressbar @VERSION
33
* http://jqueryui.com
44
*
5-
* Copyright jQuery Foundation and other contributors
5+
* Copyright OpenJS Foundation and other contributors
66
* Released under the MIT license.
77
* http://jquery.org/license
88
*

‎themes/base/resizable.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jQuery UI Resizable @VERSION
33
* http://jqueryui.com
44
*
5-
* Copyright jQuery Foundation and other contributors
5+
* Copyright OpenJS Foundation and other contributors
66
* Released under the MIT license.
77
* http://jquery.org/license
88
*/

‎themes/base/selectable.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jQuery UI Selectable @VERSION
33
* http://jqueryui.com
44
*
5-
* Copyright jQuery Foundation and other contributors
5+
* Copyright OpenJS Foundation and other contributors
66
* Released under the MIT license.
77
* http://jquery.org/license
88
*/

‎themes/base/selectmenu.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jQuery UI Selectmenu @VERSION
33
* http://jqueryui.com
44
*
5-
* Copyright jQuery Foundation and other contributors
5+
* Copyright OpenJS Foundation and other contributors
66
* Released under the MIT license.
77
* http://jquery.org/license
88
*

‎themes/base/slider.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jQuery UI Slider @VERSION
33
* http://jqueryui.com
44
*
5-
* Copyright jQuery Foundation and other contributors
5+
* Copyright OpenJS Foundation and other contributors
66
* Released under the MIT license.
77
* http://jquery.org/license
88
*

‎themes/base/sortable.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jQuery UI Sortable @VERSION
33
* http://jqueryui.com
44
*
5-
* Copyright jQuery Foundation and other contributors
5+
* Copyright OpenJS Foundation and other contributors
66
* Released under the MIT license.
77
* http://jquery.org/license
88
*/

‎themes/base/spinner.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jQuery UI Spinner @VERSION
33
* http://jqueryui.com
44
*
5-
* Copyright jQuery Foundation and other contributors
5+
* Copyright OpenJS Foundation and other contributors
66
* Released under the MIT license.
77
* http://jquery.org/license
88
*

‎themes/base/tabs.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* jQuery UI Tabs @VERSION
33
* http://jqueryui.com
44
*
5-
* Copyright jQuery Foundation and other contributors
5+
* Copyright OpenJS Foundation and other contributors
66
* Released under the MIT license.
77
* http://jquery.org/license
88
*

0 commit comments

Comments
 (0)