' +
@@ -161,7 +162,7 @@ $(function () {
$(".sortable").sortable({
beforeStop: function (event, element) {
var sortedIDs = $(".sortable").sortable("toArray");
- emit("admin.reorderSlides", {sortedIDs: sortedIDs});
+ emit("admin.reorderSlides", {bundleName: serverOptions.currentBundle, sortedIDs: sortedIDs});
}
}).disableSelection();
});
@@ -187,6 +188,11 @@ function addLink() {
editSlide("", "webpage");
}
+
+function editBundleSlides(name) {
+ window.open("/admin/edit/bundleSlides?bundle=" + name, '_blank', 'location=no,height=800,width=400,scrollbars=yes,status=no');
+}
+
function editSlide(name, type) {
switch (type) {
case "slide":
@@ -199,15 +205,15 @@ function editSlide(name, type) {
}
function editBundle(bundleName) {
- window.open("/admin/edit/bundle?bundle=" + bundleName, '_blank', 'location=no,height=500,width=700,scrollbars=yes,status=no');
+ window.open("/admin/edit/bundleProperties?bundle=" + bundleName, '_blank', 'location=no,height=500,width=700,scrollbars=yes,status=no');
}
-function emit(callback, data) {
+function emit(eventName, data) {
if (data === undefined || data === null) {
data = {};
}
Object.assign(data, {displayId: parseInt(displayId)});
- socket.emit(callback, data);
+ socket.emit(eventName, data);
}
/**
@@ -271,7 +277,7 @@ function updateSlides(settings) {
'' +
'' +
'' +
- '' +
+ '' +
'
' +
'
' +
@@ -288,7 +294,9 @@ function updateSlides(settings) {
}
-function remove(obj) {
+function remove(uuid) {
+ var obj = {bundleName: serverOptions.currentBundle, uuid: uuid};
+
if (confirm("Really delete slide?")) {
emit('admin.removeSlide', obj);
}
diff --git a/public/js/display.js b/public/js/display.js
index 473ad20..4b891da 100644
--- a/public/js/display.js
+++ b/public/js/display.js
@@ -340,14 +340,15 @@ function preloadImages(allSlides) {
}
function reloadImage(data) {
- window.f.clearImageById(data.uuid);
- window.f.setupImages();
-
- var image = new Image();
- image.src = "/render/" + data.bundle + "/" + data.uuid + ".png?" + uuidv4();
- image.id = data.uuid;
- window.f.images.push(image);
+ if (serverOptions.currentBundle === data.bundleName) {
+ window.f.clearImageById(data.uuid);
+ window.f.setupImages();
+ var image = new Image();
+ image.src = "/render/" + data.bundleName + "/" + data.uuid + ".png?" + uuidv4();
+ image.id = data.uuid;
+ window.f.images.push(image);
+ }
}
var fluxIds;
diff --git a/public/js/edit.js b/public/js/edit.js
index c11617b..c5dd39a 100644
--- a/public/js/edit.js
+++ b/public/js/edit.js
@@ -256,7 +256,7 @@ function setBackground(background) {
bgImage.src = background;
bg.show();
$(video).hide();
- video.src = null;
+ video.src = "";
video.pause();
}
}
@@ -419,7 +419,8 @@ function removeSelectedObjects() {
}
function cueSlide() {
- if (confirm('Pause show and force display of the current slide?')) {
+
+ if (confirm('Force display of the current slide?')) {
var duration = null;
if ($.isNumeric($("#duration").val())) {
duration = parseFloat($("#duration").val());
@@ -468,7 +469,6 @@ function save() {
duration: duration,
json: canvas.toJSON(['id']),
png: canvas.toDataURL('png'),
- displayId: displayId,
displayTime: checked,
transition: transition,
};
diff --git a/public/js/upload.js b/public/js/upload.js
index 4939508..9c015fb 100644
--- a/public/js/upload.js
+++ b/public/js/upload.js
@@ -105,7 +105,6 @@ function upload(uid, useOriginal) {
name: filename,
imageData: images[uid].data,
type: images[uid].type,
- displayId: displayId
});
} else {
socket.emit("edit.uploadImage", {
@@ -113,7 +112,6 @@ function upload(uid, useOriginal) {
name: filename + "_crop",
imageData: images[uid].crop,
type: "image/png",
- displayId: displayId
});
}
diff --git a/routes/admin.js b/routes/admin.js
index 5a06989..9472513 100644
--- a/routes/admin.js
+++ b/routes/admin.js
@@ -27,11 +27,11 @@ module.exports = function (websocket) {
router.get('/edit/slide', function (req, res, next) {
let bundle = req.query['bundle'];
let file = req.query['file'];
- let displayId = req.query['displayId'] || 0;
- res.render('admin/edit', {config: config, bundle: bundle, displayId: displayId, file: file});
+ let displayId = req.query['displayId'] || null;
+ res.render('admin/editSlide', {config: config, bundle: bundle, displayId: displayId, file: file});
});
- router.post('/edit/bundle', function (req, res, next) {
+ router.post('/edit/bundleProperties', function (req, res, next) {
let bundleData = {};
var transition = null;
@@ -59,11 +59,11 @@ module.exports = function (websocket) {
bundleData.useWebFonts = useWebFonts;
bundleData.displayTime = displayTime;
bundleData.styleHeader.fontFamily = req.body.headerFontFamily;
- bundleData.styleHeader.fontSize = req.body.headerFontSize;
+ bundleData.styleHeader.fontSize = parseInt(req.body.headerFontSize);
bundleData.styleHeader.fill = req.body.headerFill;
bundleData.styleHeader.stroke = req.body.headerStroke;
bundleData.styleText.fontFamily = req.body.textFontFamily;
- bundleData.styleText.fontSize = req.body.textFontSize;
+ bundleData.styleText.fontSize = parseInt(req.body.textFontSize);
bundleData.styleText.fill = req.body.textFill;
bundleData.styleText.stroke = req.body.textStroke;
bundleManager.getBundle(req.body.bundle).save();
@@ -76,7 +76,7 @@ module.exports = function (websocket) {
res.send("");
});
- router.get('/edit/bundle', function (req, res, next) {
+ router.get('/edit/bundleProperties', function (req, res, next) {
let bundle = req.query['bundle'];
let bundleData = {};
try {
@@ -85,8 +85,7 @@ module.exports = function (websocket) {
cli.error("error loading bundle", err);
}
- // console.log(bundleData);
- res.render('admin/editBundle', {config: config, bundle: bundle, bundleData: bundleData});
+ res.render('admin/editBundleProperties', {config: config, bundle: bundle, bundleData: bundleData});
});
router.get('/edit/link', function (req, res, next) {
@@ -97,19 +96,19 @@ module.exports = function (websocket) {
});
- router.get('/bundle', function (req, res, next) {
- let bundles = getDirectories("./data");
- res.render('admin/listBundle', {config: config, bundles: bundles});
+ router.get('/edit/bundleSlides', function (req, res, next) {
+ // let bundles = getDirectories("./data");
+ var bundle = {};
+ try {
+ bundle = bundleManager.getBundle(req.query['bundle']);
+ } catch (err) {
+
+ }
+ console.log(bundle);
+ res.render('admin/editBundleSlides', {config: config, bundle: bundle});
});
- router.get('/edit/bundle', function (req, res, next) {
- let bundle = req.query['bundle'];
- let file = req.query['file'];
- let displayId = req.query['displayId'] || 0;
- res.render('admin/editBundle', {config: config, bundle: bundle, displayId: displayId, file: file});
- });
-
router.get('/ajax/imagelist', function (req, res, next) {
let bundle = req.query['bundle'];
let bundleRoot = path.normalize("./data/" + bundle);
diff --git a/views/admin/editBundle.twig b/views/admin/editBundleProperties.twig
similarity index 98%
rename from views/admin/editBundle.twig
rename to views/admin/editBundleProperties.twig
index f9f5d5b..d7d1a26 100644
--- a/views/admin/editBundle.twig
+++ b/views/admin/editBundleProperties.twig
@@ -13,7 +13,7 @@
Most of the changes are applied for live environment at next slide change.