Mercurial > hg > batmud > maputils

changeset 2588:1436eecc751f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make some if () branches a bit clearer by using blocks.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 11 Feb 2024 16:49:49 +0200
parents 2fd719592d89
children 2a535f601677
files www/search.js
diffstat 1 files changed, 84 insertions(+), 80 deletions(-) [+]
line wrap: on
line diff
--- a/www/search.js	Sun Feb 11 16:28:48 2024 +0200
+++ b/www/search.js	Sun Feb 11 16:49:49 2024 +0200
@@ -243,46 +243,47 @@
   dataWS.onmessage = function(evt)
   {
     if (mapHandleError(evt.data))
-    if (evt.data.substr(0, 5) == "MAPS:" && evt.data.length > 8)
     {
-      var results = mapValidateJSON(evt.data.substr(5), 3, 3);
-      if (Array.isArray(results) && results.length > 0)
+      if (evt.data.substr(0, 5) == "MAPS:" && evt.data.length > 8)
       {
-        mapList = results;
+        var results = mapValidateJSON(evt.data.substr(5), 3, 3);
+        if (Array.isArray(results) && results.length > 0)
+        {
+          mapList = results;
 
-        // Create list of map selection buttons
-        var mobj = document.getElementById("mapList");
-        mapClearChildren(mobj);
+          // Create list of map selection buttons
+          var mobj = document.getElementById("mapList");
+          mapClearChildren(mobj);
 
-        for (var i = 0; i < results.length; i++)
-        {
-          var res = results[i];
-          var id = "map_"+ res[0];
+          for (var i = 0; i < results.length; i++)
+          {
+            var res = results[i];
+            var id = "map_"+ res[0];
 
-          // Checkbox input
-          var mbut = mapCE("input", id);
-          mbut.type = "checkbox";
-          mbut.checked = true;
-          mbut.className = "map";
+            // Checkbox input
+            var mbut = mapCE("input", id);
+            mbut.type = "checkbox";
+            mbut.checked = true;
+            mbut.className = "map";
 
-          mapAddEventOb(id, mbut, "change", mapUpdateMapCount);
-          mobj.appendChild(mbut);
+            mapAddEventOb(id, mbut, "change", mapUpdateMapCount);
+            mobj.appendChild(mbut);
 
-          // Label for button
-          var mlabel = mapCE("label");
-          mlabel.htmlFor = id;
-          mlabel.textContent = mapCapitalize(res[0]);
-          mobj.appendChild(mlabel);
+            // Label for button
+            var mlabel = mapCE("label");
+            mlabel.htmlFor = id;
+            mlabel.textContent = mapCapitalize(res[0]);
+            mobj.appendChild(mlabel);
+          }
+
+          mapUpdateMapCount();
         }
-
-        mapUpdateMapCount();
+        else
+          mapResult("ERROR: "+ results);
       }
       else
-        mapResult("ERROR: "+ results);
+        mapResult("ERROR: Unknown reply from server.");
     }
-    else
-      mapResult("ERROR: Unknown reply from server.");
-
     dataWS.close();
   };
 }
@@ -334,34 +335,35 @@
   qtmpWS.onmessage = function(evt)
   {
     if (mapHandleError(evt.data))
-    if (evt.data.substr(0, 7) == "RESULT:" && evt.data.length >= 9)
     {
-      var results = mapValidateJSON(evt.data.substr(7), 2, 9);
+      if (evt.data.substr(0, 7) == "RESULT:" && evt.data.length >= 9)
+      {
+        var results = mapValidateJSON(evt.data.substr(7), 2, 9);
 
-      if (Array.isArray(results) && results.length > 0 && mid)
-      {
-        var str = "";
-
-        // Format results, if any
-        for (var i = 1; i < results.length; i++)
+        if (Array.isArray(results) && results.length > 0 && mid)
         {
-          var res = results[i];
-          var flags = res[5];
-          var names = res[8];
+          var str = "";
+
+          // Format results, if any
+          for (var i = 1; i < results.length; i++)
+          {
+            var res = results[i];
+            var flags = res[5];
+            var names = res[8];
 
-          str += "<div class=\"nearby\" title=\""+ names.join(" | ") +"\">"+
-            "<a target=\"_blank\" href=\""+ res[0] +".html#loc"+
-            res[1] +"_"+ res[2] +"\">"+
-            mapGetLocPrefix(flags) + names[0] +"</a>" +
-            " "+ mapGetGMapLink(res[3], res[4]) +
-            " dist "+ res[7] +
-            "</div>";
+            str += "<div class=\"nearby\" title=\""+ names.join(" | ") +"\">"+
+              "<a target=\"_blank\" href=\""+ res[0] +".html#loc"+
+              res[1] +"_"+ res[2] +"\">"+
+              mapGetLocPrefix(flags) + names[0] +"</a>" +
+              " "+ mapGetGMapLink(res[3], res[4]) +
+              " dist "+ res[7] +
+              "</div>";
+          }
+
+          mid.innerHTML += str;
         }
-
-        mid.innerHTML += str;
       }
     }
-
     qtmpWS.close();
   };
 }
@@ -421,46 +423,48 @@
   mapWS.onmessage = function(evt)
   {
     if (mapHandleError(evt.data))
-    if (evt.data.substr(0, 7) == "RESULT:" && evt.data.length >= 9)
     {
-      var results = mapValidateJSON(evt.data.substr(7), 7, 5);
-
-      if (Array.isArray(results) && results.length > 0)
+      if (evt.data.substr(0, 7) == "RESULT:" && evt.data.length >= 9)
       {
-        var glb = results[0];
-        var str =
-          "<div class=\"resultHead\">Search pattern size <b>"+ glb[5] +" x "+ glb[6] +"</b>"+
-          (glb[2] ? " (Centered at <b>"+ glb[3] +", "+ glb[4] +"</b>)" : " (Not centered)") +
-          "</div><div class=\"resultHead\"><b>"+ glb[0] +"</b> match"+
-          ((glb[0] > 1 || glb[0] == 0) ? "es" : "") +" found, match limit is "+ glb[1] +".</div>";
+        var results = mapValidateJSON(evt.data.substr(7), 7, 5);
 
-        // First element is the global info
-        if (results.length <= 1)
-          str += "<div class=\"resultHead\">No matches found.</div>";
+        if (Array.isArray(results) && results.length > 0)
+        {
+          var glb = results[0];
+          var str =
+            "<div class=\"resultHead\">Search pattern size <b>"+ glb[5] +" x "+ glb[6] +"</b>"+
+            (glb[2] ? " (Centered at <b>"+ glb[3] +", "+ glb[4] +"</b>)" : " (Not centered)") +
+            "</div><div class=\"resultHead\"><b>"+ glb[0] +"</b> match"+
+            ((glb[0] > 1 || glb[0] == 0) ? "es" : "") +" found, match limit is "+ glb[1] +".</div>";
+
+          // First element is the global info
+          if (results.length <= 1)
+            str += "<div class=\"resultHead\">No matches found.</div>";
 
-        var mobj = document.getElementById("results");
-        mobj.innerHTML = str;
+          var mobj = document.getElementById("results");
+          mobj.innerHTML = str;
 
-        // Format results, if any
-        for (var i = 1; i < results.length; i++)
-        {
-          var res = results[i];
-          var mid = mapCE("div");
-          mid.className = "resultData";
-          mid.innerHTML = "<span class=\"resultData\">"+ res[1] +", "+ res[2] +" at "+
-            mapCapitalize(res[0]) +" "+
-            mapGetGMapLink(res[3], res[4]) +
-            "</span>";
+          // Format results, if any
+          for (var i = 1; i < results.length; i++)
+          {
+            var res = results[i];
+            var mid = mapCE("div");
+            mid.className = "resultData";
+            mid.innerHTML = "<span class=\"resultData\">"+ res[1] +", "+ res[2] +" at "+
+              mapCapitalize(res[0]) +" "+
+              mapGetGMapLink(res[3], res[4]) +
+              "</span>";
 
-          mobj.appendChild(mid);
-          mapGetNearby(res[3], res[4], mid);
+            mobj.appendChild(mid);
+            mapGetNearby(res[3], res[4], mid);
+          }
         }
+        else
+          mapResult("ERROR: "+ results);
       }
       else
-        mapResult("ERROR: "+ results);
+        mapResult("ERROR: Unknown reply from server.");
     }
-    else
-      mapResult("ERROR: Unknown reply from server.");
 
     mapWS.close();
   };