UiO-Gaming/infoscreen3
1
0 Fork 0
mirror of https://github.com/UiO-Gaming/infoscreen3.git synced 2026-11-05 13:56:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix transitions for webpages as well

Browse Source
This commit is contained in:
Timo Wagner committed 2025-11-08 21:54:56 +01:00
1 parent 862d45f621
commit 27cfd2a553
3 files changed
+17 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

modules/admin.js
+3
View File
@@ -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", {});
modules/bundle.js
+12 -14
View File
@@ -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);
}
}
}
public/js/displayWebGl.js
+2 -1
View File
@@ -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());