Refactor: handle array responses from the server at one place

diff --git a/trivabble.js b/trivabble.js
index b3ca064b963fcb5e78fc5c57a102d6c32a51e4e1..f39d684768051617b7c1c987713144fb17839c50 100644 (file)
--- a/trivabble.js
+++ b/trivabble.js
@@ -491,6 +491,13 @@
     }
 
     function handleReceivedData(data) {
+        if (data instanceof Array) {
+            for (var i = 0; i < data.length; i++) {
+                handleReceivedData(data[i]);
+            }
+            return;
+        }
+
         if (data.msg) {
             chatMessages.appendChild(
                 document.createElement("div")
@@ -735,14 +742,7 @@
                         }
 
                         retriedImmediately = false;
-
-                        if (msgs instanceof Array) {
-                            for (var i = 0; i < msgs.length; i++) {
-                                handleReceivedData(msgs[i]);
-                            }
-                        } else {
-                            handleReceivedData(msgs);
-                        }
+                        handleReceivedData(msgs);
                     } else {
                         break;
                     }
@@ -767,14 +767,7 @@
                 }
 
                 try {
-                    var res = JSON.parse(xhr.responseText);
-                    if (res instanceof Array) {
-                        for (var i = 0; i < res.length; i++) {
-                            handleReceivedData(res[i]);
-                        }
-                    } else {
-                        handleReceivedData(res);
-                    }
+                    handleReceivedData(JSON.parse(xhr.responseText));
                 } catch (e) {
                     fatalError(e);
                 }