From aaebcc5add6c33e91b7620cec6a2d50f0dafb744 Mon Sep 17 00:00:00 2001 From: Zack Date: Thu, 11 Feb 2016 09:05:49 -0500 Subject: [PATCH] Reloads page after 4 seconds of no websocket connection Issue #21 Former-commit-id: d6596865b03100e14ede53fea43cb21065f84ceb [formerly 34c11b504302a7179385580aa3b8dea2b713f2e6] [formerly c99631cc0ec8a8b124157225656a9d670b7b87e7 [formerly 848a4f27bde70c5310bd6591b26703b372473eb5]] Former-commit-id: ffd18222cefd54da1f4565913f1f4a06567f1e30 [formerly 2245118495b9f15f6dae8068d1bfdad6f1e7f320] Former-commit-id: 2c2762cff7df2530c979b61db77683ba951f793c --- install/awwkoala.init | 0 install/awwkoala.nginx | 0 static/img/awwkoala.png | Bin static/img/gomascot.png | Bin static/img/nginx.png | Bin static/img/raspberrypi.png | Bin static/js/websockets.js | 10 +++++++++- 7 files changed, 9 insertions(+), 1 deletion(-) mode change 100755 => 100644 install/awwkoala.init mode change 100755 => 100644 install/awwkoala.nginx mode change 100755 => 100644 static/img/awwkoala.png mode change 100755 => 100644 static/img/gomascot.png mode change 100755 => 100644 static/img/nginx.png mode change 100755 => 100644 static/img/raspberrypi.png diff --git a/install/awwkoala.init b/install/awwkoala.init old mode 100755 new mode 100644 diff --git a/install/awwkoala.nginx b/install/awwkoala.nginx old mode 100755 new mode 100644 diff --git a/static/img/awwkoala.png b/static/img/awwkoala.png old mode 100755 new mode 100644 diff --git a/static/img/gomascot.png b/static/img/gomascot.png old mode 100755 new mode 100644 diff --git a/static/img/nginx.png b/static/img/nginx.png old mode 100755 new mode 100644 diff --git a/static/img/raspberrypi.png b/static/img/raspberrypi.png old mode 100755 new mode 100644 diff --git a/static/js/websockets.js b/static/js/websockets.js index 6662f27..d298448 100644 --- a/static/js/websockets.js +++ b/static/js/websockets.js @@ -2,6 +2,7 @@ $(document).ready(function() { var isTyping = false; var typingTimer; //timer identifier var updateInterval; + var uhohTimer; var doneTypingInterval = 500; //time in ms, 5 second for example var pollToGetNewestCopyInterval = 10000; //on keyup, start the countdown @@ -24,12 +25,18 @@ $(document).ready(function() { function doneTyping() { payload = JSON.stringify({ TextData: $('#emit_data').val(), Title: title_name, UpdateServer: true, UpdateClient: false }) send(payload) - $('#saveInfo').removeClass().addClass("glyphicon glyphicon-floppy-save"); + uhohTimer = setTimeout(uhoh, 3000); + $('#saveInfo').removeClass().addClass("glyphicon glyphicon-floppy-open"); console.log("Done typing") updateInterval = setInterval(updateText, pollToGetNewestCopyInterval); document.title = "[SAVED] " + title_name; } + function uhoh() { + $('#saveInfo').removeClass().addClass("glyphicon glyphicon-remove"); + setInterval(location.reload(), 1000); + } + function updateText() { console.log("Getting server's latest copy") payload = JSON.stringify({ TextData: $('#emit_data').val(), Title: title_name, UpdateServer: false, UpdateClient: true }) @@ -57,6 +64,7 @@ $(document).ready(function() { console.log(data.TextData) if (data.TextData == "saved") { $('#saveInfo').removeClass().addClass("glyphicon glyphicon-floppy-saved"); + clearTimeout(uhohTimer); } console.log(data) }