Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Update spectrum-colorpicker [MAILPOET-3386]

Browse Source 
The deprecated jQuery methods are fixed in GitHub, but not in npm,
so I've decided to apply a patch from the repo until it gets released.
This commit is contained in:
wxa
2021-02-15 23:49:36 +03:00
committed by Veljko V
parent 3f9beaf344
commit 7423a618e2
4 changed files with 60 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
package-lock.json generated
View File

@ -65,7 +65,7 @@
"select2": "^4.0.13",
"setimmediate": "^1.0.5",
"slugify": "^1.4.0",
"spectrum-colorpicker": "^1.6.2",
"spectrum-colorpicker": "^1.8.1",
"tinymce": "^5.6.0",
"underscore": "1.8.3",
"velocity-animate": "^1.5.2"
@ -27354,9 +27354,9 @@
}
},
"node_modules/spectrum-colorpicker": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/spectrum-colorpicker/-/spectrum-colorpicker-1.8.0.tgz",
"integrity": "sha1-uSbPUALAp3hgtfg1HhwJPGUgAQc="
"version": "1.8.1",
"resolved": "https://registry.npmjs.org/spectrum-colorpicker/-/spectrum-colorpicker-1.8.1.tgz",
"integrity": "sha512-x1picQ5giVso71ESII7jZ3+ZFdit8WthNkzwJqLNdPDPzrltKUQGpTohWyPfSAID+bK1zGdO6bDbSh1S6GoLYA=="
},
"node_modules/split-string": {
"version": "3.1.0",
@ -56866,9 +56866,9 @@
"dev": true
},
"spectrum-colorpicker": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/spectrum-colorpicker/-/spectrum-colorpicker-1.8.0.tgz",
"integrity": "sha1-uSbPUALAp3hgtfg1HhwJPGUgAQc="
"version": "1.8.1",
"resolved": "https://registry.npmjs.org/spectrum-colorpicker/-/spectrum-colorpicker-1.8.1.tgz",
"integrity": "sha512-x1picQ5giVso71ESII7jZ3+ZFdit8WthNkzwJqLNdPDPzrltKUQGpTohWyPfSAID+bK1zGdO6bDbSh1S6GoLYA=="
},
"split-string": {
"version": "3.1.0",

2
package.json
View File

@ -97,7 +97,7 @@
"select2": "^4.0.13",
"setimmediate": "^1.0.5",
"slugify": "^1.4.0",
"spectrum-colorpicker": "^1.6.2",
"spectrum-colorpicker": "^1.8.1",
"tinymce": "^5.6.0",
"underscore": "1.8.3",
"velocity-animate": "^1.5.2"

4
tasks/npm_post_install.sh
View File

@ -7,3 +7,7 @@ echo "import tinymce from 'tinymce/tinymce';
" >> $INIT_CWD/assets/js/src/newsletter_editor/behaviors/tinymce_icons.js
cat $INIT_CWD/node_modules/tinymce/icons/default/icons.min.js >> $INIT_CWD/assets/js/src/newsletter_editor/behaviors/tinymce_icons.js
# Replace deprecated jQuery methods in the spectrum-colorpicker dependency
# Remove this when a patch is included in a package update
git apply $INIT_CWD/tasks/patches/spectrum-replace-jquery-deprecated.patch || true

48
tasks/patches/spectrum-replace-jquery-deprecated.patch Normal file
View File

@ -0,0 +1,48 @@
From 8fd0a3a5f6a478f319763f999aaf5d8531c52b1d Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Tue, 21 Jul 2020 20:52:17 -0700
Subject: [PATCH] Replace deprecated jQuery methods
Fixes these warnings from jquery-migrate:
JQMIGRATE: jQuery.isArray is deprecated; use Array.isArray
JQMIGRATE: jQuery.fn.click() event shorthand is deprecated
JQMIGRATE: jQuery.fn.change() event shorthand is deprecated
JQMIGRATE: jQuery.fn.keydown() event shorthand is deprecated
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
node_modules/spectrum-colorpicker/spectrum.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/node_modules/spectrum-colorpicker/spectrum.js b/node_modules/spectrum-colorpicker/spectrum.js
index e2e0687..6c48c12 100644
--- a/node_modules/spectrum-colorpicker/spectrum.js
+++ b/node_modules/spectrum-colorpicker/spectrum.js
@@ -249,7 +249,7 @@
if (opts.palette) {
palette = opts.palette.slice(0);
- paletteArray = $.isArray(palette[0]) ? palette : [palette];
+ paletteArray = Array.isArray(palette[0]) ? palette : [palette];
paletteLookup = {};
for (var i = 0; i < paletteArray.length; i++) {
for (var j = 0; j < paletteArray[i].length; j++) {
@@ -321,14 +321,14 @@
}
// Prevent clicks from bubbling up to document. This would cause it to be hidden.
- container.click(stopPropagation);
+ container.on("click", stopPropagation);
// Handle user typed input
- textInput.change(setFromTextInput);
+ textInput.on("change", setFromTextInput);
textInput.on("paste", function () {
setTimeout(setFromTextInput, 1);
});
- textInput.keydown(function (e) { if (e.keyCode == 13) { setFromTextInput(); } });
+ textInput.on("keydown", function (e) { if (e.keyCode == 13) { setFromTextInput(); } });
cancelButton.text(opts.cancelText);
cancelButton.on("click.spectrum", function (e) {