replace client-triggered state refresh with server-triggered

diff --git a/ppt_control/static/ppt-control.js b/ppt_control/static/ppt-control.js
index 9bba1714f2b97a088cc6f4c39d6209cacb41bb17..2265ca3f25aa30e8f4e45b3bcae1715107ce44c4 100644 (file)
--- a/ppt_control/static/ppt-control.js
+++ b/ppt_control/static/ppt-control.js
@@ -172,8 +172,13 @@ function disconnect() {
     users.textContent = "Connection to PowerPoint failed";
 }
 
+function update_current() {
+}
+
+function update_next() {
+}
+
 websocket.onmessage = function (event) {
-       console.log("Received data");
     data = JSON.parse(event.data);
     switch (data.type) {
         case 'state':
@@ -183,40 +188,37 @@ websocket.onmessage = function (event) {
                break;
             }
             var d = new Date;
-            switch (data.visible) {
-                case 3:
-                    current_img.src = "/black.jpg";
-                    break;
-                case 4:
-                    current_img.src = "/white.jpg";
-                    break;
-                default:
-                    //current_img.src = "/cache/" + data.current + ".jpg?t=" + d.getTime();
-                    current_img.src = "/cache/" + data.current + ".jpg";
-                    break;
+            if (show_current.checked) {
+              switch (data.visible) {
+                  case 3:
+                      current_img.src = "/black.jpg";
+                      break;
+                  case 4:
+                      current_img.src = "/white.jpg";
+                      break;
+                  default:
+                      current_img.src = "/cache/" + data.current + ".jpg?t=" + d.getTime();
+                      //current_img.src = "/cache/" + data.current + ".jpg";
+                      break;
+              }
             }
             if (data.current == data.total + 1) { 
-                //next_img.src = "/cache/" + (data.total + 1) + ".jpg?t=" + d.getTime();
-                next_img.src = "/cache/" + (data.total + 1) + ".jpg";
+                next_img.src = "/cache/" + (data.total + 1) + ".jpg?t=" + d.getTime();
+                //next_img.src = "/cache/" + (data.total + 1) + ".jpg";
             } else {
-                //next_img.src = "/cache/" + (data.current + 1) + ".jpg?t=" + d.getTime();
-                next_img.src = "/cache/" + (data.current + 1) + ".jpg";
+                next_img.src = "/cache/" + (data.current + 1) + ".jpg?t=" + d.getTime();
+                //next_img.src = "/cache/" + (data.current + 1) + ".jpg";
             }
 
-                       if (document.activeElement != current) {
+            if (document.activeElement != current) {
                current.value = data.current;
             }
             total.textContent = data.total;
             document.title = data.name;
             break;
-        case 'users':
-            users.textContent = (
-                data.count.toString() + " client" +
-                (data.count == 1 ? "" : "s"));
-            break;
         default:
             console.error(
-                "unsupported event", data);
+                "Unsupported event", data);
     }
        if (preloaded == false && ! isNaN(total.textContent)) {
                image = document.getElementById("preload_img");
@@ -230,11 +232,3 @@ websocket.onmessage = function (event) {
        }
 
 };
-
-var interval = setInterval(refresh, 1000);
-
-function refresh() {
-       console.log("Refreshing")
-    websocket.send(JSON.stringify({action: 'refresh'}));
-}
-