Refactor: simplify the part handling EventSource

diff --git a/trivabble.js b/trivabble.js
index 860b64c44aa74396535a6cc49131702bcffe17a6..1cfd57c805c29180a37e42c66b06d95bc8ab98c3 100644 (file)
--- a/trivabble.js
+++ b/trivabble.js
@@ -818,34 +818,33 @@
             }
 
             pollingServer = true;
-            thisRequestIsPolling = true;
             data.version = VERSION;
-        }
 
-        if (!thisRequestIsPolling) {
-            blockMove++;
-        }
+            if (window.EventSource) {
+                eventSource = new EventSource('/:trivabble/sse/' + JSON.stringify(data));
 
-        if (thisRequestIsPolling && window.EventSource) {
-            eventSource = new EventSource('/:trivabble/sse/' + JSON.stringify(data));
+                eventSource.onopen = connectionReady;
 
-            eventSource.onopen = connectionReady;
+                eventSource.onmessage = function (e) {
+                    connectionReady();
+                    parseAndHandleReceivedData(e.data);
+                };
 
-            eventSource.onmessage = function (e) {
-                connectionReady();
-                parseAndHandleReceivedData(e.data);
-            };
+                eventSource.onerror = function () {
+                    pollingReady = false;
+                    if (needsRestart) {
+                        eventSource.close();
+                    } else if (!blockEventSourceAutoRetry) {
+                        retryPolling();
+                    }
+                };
 
-            eventSource.onerror = function () {
-                pollingReady = false;
-                if (needsRestart) {
-                    eventSource.close();
-                } else if (!blockEventSourceAutoRetry) {
-                    retryPolling();
-                }
-            };
+                return;
+            }
 
-            return;
+            thisRequestIsPolling = true;
+        } else {
+            blockMove++;
         }
 
         var xhr = new XMLHttpRequest();
@@ -855,8 +854,6 @@
         xhr.send(JSON.stringify(data));
 
         xhr.onreadystatechange = function () {
-            // TODO error handling
-
             if (xhr.readyState === 2 && thisRequestIsPolling) {
                 connectionReady();
             } else if (xhr.readyState === 3 && thisRequestIsPolling) {