diff --git a/configuration b/configuration index f0bf775935..64c5c956d8 100644 --- a/configuration +++ b/configuration @@ -37,9 +37,10 @@ export TIPPY_JS=6.3.7 export PDF_JS=2.8.335 export REVEAL_JS=5.1.0 export REVEAL_JS_MENU=2.1.0 -# unrelease version needed for a fix with Reveal.js 5 +# unrelease version needed for fixes with Reveal.js 5 # https://github.com/rajgoel/reveal.js-plugins/pull/180 -export REVEAL_JS_CHALKBOARD=8408d5a265abf74a042122520bbb4fd0d31feaed +# https://github.com/rajgoel/reveal.js-plugins/pull/184 +export REVEAL_JS_CHALKBOARD=217142176341e24628db2908cae38221ef13d639 export REVEAL_JS_PDFEXPORT=2.0.1 export LIST_JS=2.3.1 export DAY_JS=1.11.7 diff --git a/package/src/common/patches/revealjs-plugin-0001-chakboard-backdrop-filter.patch b/package/src/common/patches/revealjs-plugin-0001-chakboard-backdrop-filter.patch deleted file mode 100644 index e316d51096..0000000000 --- a/package/src/common/patches/revealjs-plugin-0001-chakboard-backdrop-filter.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/resources/formats/revealjs/plugins/chalkboard/plugin.js b/src/resources/formats/revealjs/plugins/chalkboard/plugin.js -index 543ee101f..e9bd64ea3 100644 ---- a/src/resources/formats/revealjs/plugins/chalkboard/plugin.js -+++ b/src/resources/formats/revealjs/plugins/chalkboard/plugin.js -@@ -444,8 +444,8 @@ const initChalkboard = function ( Reveal ) { - container.style.visibility = 'visible'; - container.style.pointerEvents = 'none'; - container.style['backdrop-filter'] = 'none'; -- // for older safari -- container.style["-webkit-backdrop-filter"] = "none"; -+ // for older safari -+ container.style["-webkit-backdrop-filter"] = "none"; - - var slides = document.querySelector( '.slides' ); - var aspectRatio = Reveal.getConfig().width / Reveal.getConfig().height; diff --git a/package/src/common/update-html-dependencies.ts b/package/src/common/update-html-dependencies.ts index 49dcc14887..3b6f578049 100644 --- a/package/src/common/update-html-dependencies.ts +++ b/package/src/common/update-html-dependencies.ts @@ -387,11 +387,6 @@ export async function updateHtmlDependencies(config: Configuration) { }, true, // true if commit, false otherwise false, // no v prefix, - // FIXME: Patch waiting for fix upstream to be merged - // https://github.com/rajgoel/reveal.js-plugins/pull/184 - resolvePatches([ - "revealjs-plugin-0001-chakboard-backdrop-filter.patch" - ]) ); // revealjs-menu @@ -1128,7 +1123,7 @@ async function updateGithubSourceCodeDependency( await unzip(zipFile, working); await onDownload(working, version); - if (patches) applyGitPatches(patches); + if (patches) await applyGitPatches(patches); } else { throw new Error(`${versionEnvVar} is not defined`); } diff --git a/src/resources/formats/revealjs/plugins/chalkboard/plugin.js b/src/resources/formats/revealjs/plugins/chalkboard/plugin.js index e9bd64ea37..8a20246869 100644 --- a/src/resources/formats/revealjs/plugins/chalkboard/plugin.js +++ b/src/resources/formats/revealjs/plugins/chalkboard/plugin.js @@ -444,8 +444,7 @@ const initChalkboard = function ( Reveal ) { container.style.visibility = 'visible'; container.style.pointerEvents = 'none'; container.style['backdrop-filter'] = 'none'; - // for older safari - container.style["-webkit-backdrop-filter"] = "none"; + container.style['-webkit-backdrop-filter'] = 'none'; var slides = document.querySelector( '.slides' ); var aspectRatio = Reveal.getConfig().width / Reveal.getConfig().height;