From 27cfd2a553c8e04ce186fa5ad91cbec6598f73ee Mon Sep 17 00:00:00 2001 From: Timo Wagner Date: Sat, 8 Nov 2025 21:54:56 +0100 Subject: [PATCH] Fix transitions for webpages as well --- modules/admin.js | 3 +++ modules/bundle.js | 26 ++++++++++++-------------- public/js/displayWebGl.js | 3 ++- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/modules/admin.js b/modules/admin.js index 5be93ce..dba73f7 100644 --- a/modules/admin.js +++ b/modules/admin.js @@ -367,6 +367,9 @@ export default class admin { } bundle.save(); + // Adds empty slide render for smooth transitions + fs.copyFileSync("./templates/bundle/render/empty.png","./data/bundles/" + data.bundleName + "/render/" + filename + ".png") + cli.success("save web link"); socket.emit("callback.saveLink", {}); diff --git a/modules/bundle.js b/modules/bundle.js index e1d404b..aebc681 100644 --- a/modules/bundle.js +++ b/modules/bundle.js @@ -115,21 +115,19 @@ export default class bundleClass { x++; } if (slide.uuid === uuid) { - if (slide.type === "slide" || slide.type === "video") { - let path = process.cwd() + "/data/bundles/" + this.name; - try { - uuid = checkAndSanitizeFilePathName(uuid) - if (fs.existsSync(path + "/render/" + uuid + ".png")) { - fs.unlinkSync(path + "/render/" + uuid + ".png"); - cli.success("removing file:" + path + "/render/" + uuid + ".png"); - } - if (fs.existsSync(path + "/slides/" + uuid)) { - fs.unlinkSync(path + "/slides/" + uuid); - cli.success("removing file:" + path + "/slides/" + uuid); - } - } catch (err) { - cli.error("error while deleting file:" + uuid, err); + let path = process.cwd() + "/data/bundles/" + this.name; + try { + uuid = checkAndSanitizeFilePathName(uuid) + if (fs.existsSync(path + "/render/" + uuid + ".png")) { + fs.unlinkSync(path + "/render/" + uuid + ".png"); + cli.success("removing file:" + path + "/render/" + uuid + ".png"); } + if (fs.existsSync(path + "/slides/" + uuid)) { + fs.unlinkSync(path + "/slides/" + uuid); + cli.success("removing file:" + path + "/slides/" + uuid); + } + } catch (err) { + cli.error("error while deleting file:" + uuid, err); } } } diff --git a/public/js/displayWebGl.js b/public/js/displayWebGl.js index eb45de6..7888e68 100644 --- a/public/js/displayWebGl.js +++ b/public/js/displayWebGl.js @@ -295,12 +295,13 @@ function nextSlide(data) { $("#slider").hide(); video.pause(); $("#stream").hide(); + sketch.showSlide(serverOptions.currentFile, serverOptions.transition); $("#" + getWebLayer()).css("transform", "scale(" + serverOptions.currentMeta.zoom + ")"); $("#" + getWebLayer()).addClass("fadeIn").removeClass("fadeOut"); displayWebPage(serverOptions.currentMeta.webUrl); break; case "video": - sketch.showSlide(serverOptions.currentFile, serverOptions.transition); + sketch.showSlide(serverOptions.currentFile, serverOptions.transition); displayVideo(serverOptions.currentMeta.url, serverOptions.currentMeta.loop, serverOptions.currentMeta.mute); setTimeout(function () { clearIFrame(getWebLayer());