From 0ae8ee0efcd05f91eb88e0d02a1af50cccdbbb0f Mon Sep 17 00:00:00 2001
From: Reaby <petri.jarvisalo@gmail.com>
Date: Thu, 9 May 2019 17:40:40 +0300
Subject: [PATCH] remove grid on announce, and add it back afterwards

---
 public/js/edit.js | 50 ++++++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/public/js/edit.js b/public/js/edit.js
index ff142b2..1ae92cb 100644
--- a/public/js/edit.js
+++ b/public/js/edit.js
@@ -311,29 +311,32 @@ function parseUrl(url) {
     return '/background' + url.split('background')[1]
 }
 
+function drawGrid() {
+    var w = 1280 / 32 / 8;
+
+    // Grid display part
+    for (var i = 1; i <= (1280 / grid); i++) {
+        canvas.add(new fabric.Line([i * grid, 0, i * grid, 1280], {
+            stroke: '#ccc',
+            strokeDashArray: [w, w],
+            opacity: 0.5,
+            selectable: false,
+            zIndex: 0
+        }));
+        canvas.add(new fabric.Line([0, i * grid, 1280, i * grid], {
+            stroke: '#ccc',
+            strokeDashArray: [w, w],
+            opacity: 0.5,
+            selectable: false,
+            zIndex: 0
+        }))
+    }
+    canvas.renderAll();
+}
 
 function nextSlide(data) {
     canvas.loadFromJSON(data.json, function () {
-        var w = 1280 / 32 / 8;
-
-        // Grid display part
-        for (var i = 1; i <= (1280 / grid); i++) {
-            canvas.add(new fabric.Line([i * grid, 0, i * grid, 1280], {
-                stroke: '#ccc',
-                strokeDashArray: [w, w],
-                opacity: 0.5,
-                selectable: false,
-                zIndex: 0
-            }));
-            canvas.add(new fabric.Line([0, i * grid, 1280, i * grid], {
-                stroke: '#ccc',
-                strokeDashArray: [w, w],
-                opacity: 0.5,
-                selectable: false,
-                zIndex: 0
-            }))
-        }
-
+        drawGrid();
         canvas.renderAll();
 
     }, function (o, object) {
@@ -507,6 +510,11 @@ function cueSlide() {
                 duration = parseFloat($("#duration").val());
             }
 
+            var objects = canvas.getObjects('line');
+            for (let i in objects) {
+                canvas.remove(objects[i]);
+            }
+
             let obj = {
                 json: canvas.toJSON(['id']),
                 png: canvas.toDataURL('png'),
@@ -514,6 +522,8 @@ function cueSlide() {
                 duration: duration
             };
             socket.emit("admin.override", obj);
+
+            drawGrid();
         }
     } else {
         alert("Can't find display to announce");