changeset 2483:4541c68e1ebf

Improve WebSocket failure mode handling.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 18 Feb 2023 17:51:06 +0200
parents 5402702015cc
children 71e565a46274
files www/search.js
diffstat 1 files changed, 16 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/www/search.js	Fri Feb 10 02:47:54 2023 +0200
+++ b/www/search.js	Sat Feb 18 17:51:06 2023 +0200
@@ -113,6 +113,7 @@
   }
 }
 
+
 function mapCapitalize(str)
 {
   return str.substr(0, 1).toUpperCase() + str.substr(1);
@@ -231,14 +232,6 @@
   if (mlobj)
     mlobj.innerHTML = "Contacting server ...";
 
-  var mlhelp1 = document.getElementById("help1");
-  if (mlhelp1)
-    mlhelp1.style.display = "none";
-
-  var mlhelp2 = document.getElementById("help2");
-  if (mlhelp2)
-    mlhelp2.style.display = "none";
-
   dataWS.onopen = function()
   {
     if (mlobj)
@@ -590,7 +583,19 @@
   if (verr)
     verr.parentNode.removeChild(verr);
 
-  mapGetData();
+  var mlhelp1 = document.getElementById("help1");
+  if (mlhelp1)
+    mlhelp1.style.display = "none";
+
+  var mlhelp2 = document.getElementById("help2");
+  if (mlhelp2)
+    mlhelp2.style.display = "none";
+
+  if (!("WebSocket" in window))
+  {
+    mapResult("Your browser does not support WebSockets!");
+    return;
+  }
 
   fieldPattern = document.getElementById("mapPattern");
   btnMapSearch = document.getElementById("btnMapSearch");
@@ -618,6 +623,8 @@
     mapResult("Cleared search pattern and results.");
   });
 
+  mapGetData();
+
   // Reset or clear map list button
   mapAddEvent("btnMaps", "click",
   function ()