From 1749a5f4151b3e63662ddc53549cb5b99da3567a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 Mar 2025 19:56:04 +0100
Subject: [PATCH 1/9] Build: Bump the github-actions group with 2 updates
Bumps the github-actions group with 2 updates: [github/codeql-action](https://github.com/github/codeql-action) and [actions/cache](https://github.com/actions/cache).
Closes gh-2334
Updates `github/codeql-action` from 3.28.8 to 3.28.10
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/dd746615b3b9d728a6a37ca2045b68ca76d4841a...b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d)
Updates `actions/cache` from 4.2.0 to 4.2.2
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/1bd1e32a3bdc45362d1e726936510720a7c30a57...d4323d4df104b026a6aa633fdb11d772146be0bf)
---
updated-dependencies:
- dependency-name: github/codeql-action
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: github-actions
- dependency-name: actions/cache
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: github-actions
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/codeql-analysis.yml | 6 +++---
.github/workflows/filestash.yml | 2 +-
.github/workflows/node.js.yml | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index e7c145c0a6..cc842ea8e2 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -33,7 +33,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
- uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+ uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
# Override language selection by uncommenting this and choosing your languages
# with:
# languages: go, javascript, csharp, python, cpp, java
@@ -41,7 +41,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
- uses: github/codeql-action/autobuild@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+ uses: github/codeql-action/autobuild@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
# âšī¸ Command-line programs to run using the OS shell.
# đ https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -55,4 +55,4 @@ jobs:
# make release
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+ uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
diff --git a/.github/workflows/filestash.yml b/.github/workflows/filestash.yml
index 7716025a08..88c949ea42 100644
--- a/.github/workflows/filestash.yml
+++ b/.github/workflows/filestash.yml
@@ -25,7 +25,7 @@ jobs:
node-version: ${{ env.NODE_VERSION }}
- name: Cache
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+ uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ env.NODE_VERSION }}-npm-lock-${{ hashFiles('**/package-lock.json') }}
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
index eef7c86e73..7614468f85 100644
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -39,7 +39,7 @@ jobs:
node-version: ${{ env.NODE_VERSION }}
- name: Cache
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+ uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ env.NODE_VERSION }}-npm-lock-${{ hashFiles('**/package-lock.json') }}
@@ -84,7 +84,7 @@ jobs:
node-version: ${{ env.NODE_VERSION }}
- name: Cache
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+ uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ env.NODE_VERSION }}-npm-lock-${{ hashFiles('**/package-lock.json') }}
@@ -122,7 +122,7 @@ jobs:
node-version: ${{ env.NODE_VERSION }}
- name: Cache
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+ uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ env.NODE_VERSION }}-npm-lock-${{ hashFiles('**/package-lock.json') }}
From ef28a5f57036e32a66e6d469e345d7376ecdaffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Go=C5=82=C4=99biowski-Owczarek?=
Date: Tue, 18 Mar 2025 09:35:16 +0100
Subject: [PATCH 2/9] Build: Remove an obsolete `test/.eslintrc.json` file
The file was erroneously left in during the migration to the flat config.
Closes gh-2340
Ref gh-2336
---
tests/.eslintrc.json | 26 --------------------------
1 file changed, 26 deletions(-)
delete mode 100644 tests/.eslintrc.json
diff --git a/tests/.eslintrc.json b/tests/.eslintrc.json
deleted file mode 100644
index 714077182a..0000000000
--- a/tests/.eslintrc.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "parserOptions": {
- "ecmaVersion": 5
- },
-
- "env": {
- "browser": true,
- "jquery": true,
- "node": false
- },
-
- "rules": {
- // Too many violations:
- "max-len": "off",
- "no-unused-vars": "off",
- "strict": "off" // ideally, `[ "error", "function" ]`
- },
-
- "globals": {
- "define": false,
- "Globalize": false,
- "QUnit": false,
- "require": true,
- "requirejs": true
- }
-}
From 6843ced12e4051aefbee47cf87fa79794737eb8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Go=C5=82=C4=99biowski-Owczarek?=
Date: Tue, 18 Mar 2025 11:45:00 +0100
Subject: [PATCH 3/9] Spinner: Drop dependency on jQuery Mousewheel
1. Listen to the native `wheel` event without depending on any wrapper plugins.
2. Keep listening to the `mousewheel` event for compatibility with projects
using the jQuery Mousewheel plugin but route it to the `wheel` handler.
Closes gh-2338
---
Gruntfile.js | 3 -
bower.json | 1 -
demos/spinner/currency.html | 2 +-
demos/spinner/decimal.html | 2 +-
demos/spinner/default.html | 2 +-
demos/spinner/latlong.html | 2 +-
demos/spinner/overflow.html | 2 +-
demos/spinner/time.html | 2 +-
external/jquery-mousewheel/LICENSE.txt | 20 --
.../jquery-mousewheel/jquery.mousewheel.js | 221 ------------------
tests/unit/spinner/core.js | 42 +++-
ui/widgets/spinner.js | 19 +-
12 files changed, 64 insertions(+), 254 deletions(-)
delete mode 100644 external/jquery-mousewheel/LICENSE.txt
delete mode 100644 external/jquery-mousewheel/jquery.mousewheel.js
diff --git a/Gruntfile.js b/Gruntfile.js
index bbb71d33e5..4f7dcc73e7 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -247,9 +247,6 @@ grunt.initConfig( {
"requirejs/require.js": "requirejs/require.js",
- "jquery-mousewheel/jquery.mousewheel.js": "jquery-mousewheel/jquery.mousewheel.js",
- "jquery-mousewheel/LICENSE.txt": "jquery-mousewheel/LICENSE.txt",
-
"jquery-simulate/jquery.simulate.js": "jquery-simulate/jquery.simulate.js",
"jquery-simulate/LICENSE.txt": "jquery-simulate/LICENSE.txt",
diff --git a/bower.json b/bower.json
index eec454dea0..3ed76cee9c 100644
--- a/bower.json
+++ b/bower.json
@@ -13,7 +13,6 @@
},
"devDependencies": {
"jquery-color": "3.0.0",
- "jquery-mousewheel": "3.1.12",
"jquery-simulate": "1.1.1",
"qunit": "2.19.4",
"requirejs": "2.1.14",
diff --git a/demos/spinner/currency.html b/demos/spinner/currency.html
index 4180b12e11..fa3744ba51 100644
--- a/demos/spinner/currency.html
+++ b/demos/spinner/currency.html
@@ -7,7 +7,7 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+