diff --git a/mailpoet/tasks/npm_post_install.sh b/mailpoet/tasks/npm_post_install.sh index 22c59f9a66..3a91ab7a49 100755 --- a/mailpoet/tasks/npm_post_install.sh +++ b/mailpoet/tasks/npm_post_install.sh @@ -7,7 +7,3 @@ 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 diff --git a/package.json b/package.json index eecac2caac..fd2177719e 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,8 @@ "patchedDependencies": { "@woocommerce/components@10.0.0": "patches/@woocommerce__components@10.0.0.patch", "backbone.supermodel@1.2.0": "patches/backbone.supermodel@1.2.0.patch", - "parsleyjs@2.9.2": "patches/parsleyjs@2.9.2.patch" + "parsleyjs@2.9.2": "patches/parsleyjs@2.9.2.patch", + "spectrum-colorpicker@1.8.1": "patches/spectrum-colorpicker@1.8.1.patch" } } } diff --git a/mailpoet/tasks/patches/spectrum-replace-jquery-deprecated.patch b/patches/spectrum-colorpicker@1.8.1.patch similarity index 55% rename from mailpoet/tasks/patches/spectrum-replace-jquery-deprecated.patch rename to patches/spectrum-colorpicker@1.8.1.patch index 44aa5e199b..6979dc6f16 100644 --- a/mailpoet/tasks/patches/spectrum-replace-jquery-deprecated.patch +++ b/patches/spectrum-colorpicker@1.8.1.patch @@ -1,26 +1,9 @@ -From 8fd0a3a5f6a478f319763f999aaf5d8531c52b1d Mon Sep 17 00:00:00 2001 -From: Anders Kaseorg -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 ---- - 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 +diff --git a/spectrum.js b/spectrum.js +index e2e068755fba7a86987a097bcf8f1def22ab10c4..6c48c12543a6ab611f5acc25ad5fd8d28b53dfd5 100644 +--- a/spectrum.js ++++ b/spectrum.js @@ -249,7 +249,7 @@ - + if (opts.palette) { palette = opts.palette.slice(0); - paletteArray = $.isArray(palette[0]) ? palette : [palette]; @@ -30,11 +13,11 @@ index e2e0687..6c48c12 100644 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); @@ -43,6 +26,6 @@ index e2e0687..6c48c12 100644 }); - 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) { + cancelButton.on("click.spectrum", function (e) { \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dd915f0c67..e8a845545c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,6 +10,9 @@ patchedDependencies: parsleyjs@2.9.2: hash: omwuxp36airmeyyvhh2whskxvm path: patches/parsleyjs@2.9.2.patch + spectrum-colorpicker@1.8.1: + hash: km5kmldrym63lx54pzrt7a3qq4 + path: patches/spectrum-colorpicker@1.8.1.patch importers: @@ -269,7 +272,7 @@ importers: select2: 4.1.0-rc.0 setimmediate: 1.0.5 slugify: 1.6.5 - spectrum-colorpicker: 1.8.1 + spectrum-colorpicker: 1.8.1_km5kmldrym63lx54pzrt7a3qq4 tinymce: 5.10.2 underscore: 1.13.4 velocity-animate: 1.5.2 @@ -18491,9 +18494,10 @@ packages: - supports-color dev: true - /spectrum-colorpicker/1.8.1: + /spectrum-colorpicker/1.8.1_km5kmldrym63lx54pzrt7a3qq4: resolution: {integrity: sha512-x1picQ5giVso71ESII7jZ3+ZFdit8WthNkzwJqLNdPDPzrltKUQGpTohWyPfSAID+bK1zGdO6bDbSh1S6GoLYA==} dev: false + patched: true /split-string/3.1.0: resolution: {integrity: sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==}