8000 Merge branch 'jquery:main' into master · jquery/jquery-ui@7e7b325 · GitHub
[go: up one dir, main page]
Skip to content 8000

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">

0 commit comments

Comments
 (0)
0