Skip to content

Commit 8d07369

Browse files
authored
Merge branch 'jquery:main' into 2361-add-touch-event-support-for-better-mobile-interaction
2 parents 4222b13 + beac2ea commit 8d07369

File tree

14 files changed

+10872
-9
lines changed

14 files changed

+10872
-9
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ jobs:
3333

3434
# Initializes the CodeQL tools for scanning.
3535
- name: Initialize CodeQL
36-
uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
36+
uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
3737
# Override language selection by uncommenting this and choosing your languages
3838
# with:
3939
# languages: go, javascript, csharp, python, cpp, java
4040

4141
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
4242
# If this step fails, then you should remove it and run the build manually (see below)
4343
- name: Autobuild
44-
uses: github/codeql-action/autobuild@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
44+
uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
4545

4646
# ℹ️ Command-line programs to run using the OS shell.
4747
# 📚 https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -55,4 +55,4 @@ jobs:
5555
# make release
5656

5757
- name: Perform CodeQL Analysis
58-
uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
58+
uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2

.github/workflows/node.js.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
run: npm run build
9999

100100
- name: Test
101-
run: npm run test:unit -- -- --headless -b edge -c ${{ matrix.CONFIGS.config }}
101+
run: npm run test:unit -- --headless -b edge -c ${{ matrix.CONFIGS.config }}
102102

103103
safari:
104104
runs-on: macos-latest

Gruntfile.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,13 +316,20 @@ grunt.initConfig( {
316316
"jquery-3.7.1/jquery.js": "jquery-3.7.1/dist/jquery.js",
317317
"jquery-3.7.1/LICENSE.txt": "jquery-3.7.1/LICENSE.txt",
318318

319+
"jquery-4.0.0-rc.1/jquery.js": "jquery-4.0.0-rc.1/dist/jquery.js",
320+
"jquery-4.0.0-rc.1/LICENSE.txt": "jquery-4.0.0-rc.1/LICENSE.txt",
321+
319322
"jquery-migrate-1.x/jquery-migrate.js":
320323
"jquery-migrate-1.x/dist/jquery-migrate.js",
321324
"jquery-migrate-1.x/LICENSE.txt": "jquery-migrate-1.x/LICENSE.txt",
322325

323326
"jquery-migrate-3.x/jquery-migrate.js":
324327
"jquery-migrate-3.x/dist/jquery-migrate.js",
325-
"jquery-migrate-3.x/LICENSE.txt": "jquery-migrate-3.x/LICENSE.txt"
328+
"jquery-migrate-3.x/LICENSE.txt": "jquery-migrate-3.x/LICENSE.txt",
329+
330+
"jquery-migrate-4.x/jquery-migrate.js":
331+
"jquery-migrate-4.x/dist/jquery-migrate.js",
332+
"jquery-migrate-4.x/LICENSE.txt": "jquery-migrate-4.x/LICENSE.txt"
326333
}
327334
}
328335
},

bower.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@
3838
"jquery-3.6.4": "jquery#3.6.4",
3939
"jquery-3.7.0": "jquery#3.7.0",
4040
"jquery-3.7.1": "jquery#3.7.1",
41+
"jquery-4.0.0-rc.1": "jquery#4.0.0-rc.1",
4142
"jquery-migrate-1.x": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-1.4.1.tgz",
42-
"jquery-migrate-3.x": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.5.2.tgz"
43+
"jquery-migrate-3.x": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.5.2.tgz",
44+
"jquery-migrate-4.x": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-4.0.0-beta.1.tgz"
4345
}
4446
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Copyright OpenJS Foundation and other contributors, https://openjsf.org/
2+
3+
Permission is hereby granted, free of charge, to any person obtaining
4+
a copy of this software and associated documentation files (the
5+
"Software"), to deal in the Software without restriction, including
6+
without limitation the rights to use, copy, modify, merge, publish,
7+
distribute, sublicense, and/or sell copies of the Software, and to
8+
permit persons to whom the Software is furnished to do so, subject to
9+
the following conditions:
10+
11+
The above copyright notice and this permission notice shall be
12+
included in all copies or substantial portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

0 commit comments

Comments
 (0)