fixes issue #25

reaby · Sep 19, 2022 · a0b3ea7 · a0b3ea7
1 parent 35aace9
commit a0b3ea7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/public/js/edit.js b/public/js/edit.js
@@ -393,13 +393,13 @@ socket.on('callback.edit', function (data) {
 
     $("#duration").val(data.slideData.duration || "");
 
-    if (slideData.epochStart != -1) {
+    if (slideData.epochStart && slideData.epochStart != -1) {
         let d = new Date(slideData.epochStart);
         let isoStr = (new Date(d.getTime() - d.getTimezoneOffset() * 60000).toISOString()).slice(0, -1);
         $("#enableStart").val(isoStr);
     }
 
-    if (slideData.epochEnd != -1) {
+    if (slideData.epochStart && slideData.epochEnd != -1) {
         let d = new Date(slideData.epochEnd);
         let isoStr = (new Date(d.getTime() - d.getTimezoneOffset() * 60000).toISOString()).slice(0, -1);
         $("#enableEnd").val(isoStr);

diff --git a/routes/admin.js b/routes/admin.js
@@ -90,10 +90,10 @@ export default function (pluginManager, websocket, dispatcher) {
             fields[fieldname] = val;
         });
 
-        req.busboy.on('file', function (fieldname, file, filename, encoding, mimeType) {
+        req.busboy.on('file', function (fieldname, file, details) {
             if (fieldname === "newBackground")
-                if (filename.length > 0 && (mimeType === "image/jpeg" || mimeType === "video/mp4" || mimeType === "image/png")) {
-                    let fstream = fs.createWriteStream('./data/backgrounds/' + filename);
+                if (details.filename.length > 0 && (details.mimeType === "image/jpeg" || details.mimeType === "video/mp4" || details.mimeType === "image/png")) {
+                    let fstream = fs.createWriteStream('./data/backgrounds/' + details.filename);
                     file.pipe(fstream);
                 } else {
                     file.resume();

diff --git a/views/admin/editSlide.twig b/views/admin/editSlide.twig
@@ -296,9 +296,7 @@
 	<canvas id="tempCanvas" width="1920" height="1080" style="display: none"></canvas>
 
 <script>
-    var socket = io.connect("{{ config.serverUrl }}:{{ config.serverListenPort }}/admin-" + displayId);
-</script>
-<script>
+	var socket = io("{{ config.serverUrl }}/admin-{{ displayId }}");
     var images = {};
     $('.ui.button').popup({
             delay: {