Safety commit

package.nw/lib/roster.js

@@ -157,7 +157,7 @@ var g_defaultSettings = {
   settingProfiles: false,
   sortColumn: "Age",
   sortReverse: true,
-  clearRosterOnBandChange: false,
+  clearRosterOnBandChange: true,
   rosterAlwaysOnTop: false,
   rosterDelayOnFocus: false,
   rosterDelayTime: 1500,
@@ -939,7 +939,9 @@ function setVisual()
     for (const key in g_rosterSettings.wanted)
     {
       if (document.getElementById(key))
-      { document.getElementById(key).checked = g_rosterSettings.wanted[key]; }
+      {
+        document.getElementById(key).checked = g_rosterSettings.wanted[key];
+      }
     }
 
     AwardTrackerControls.style.display = "none";
@@ -958,11 +960,7 @@ function setVisual()
       huntingMatrixDiv.style.display = "none";
       huntMode.style.display = "";
 
-      if (
+      if (huntMode.value != "callsign" && huntMode.value != "usstate" && huntMode.value != "dxccs")
-        huntMode.value != "callsign" &&
-        huntMode.value != "usstate" &&
-        huntMode.value != "dxccs"
-      )
       {
         huntNeed.style.display = "";
       }
@@ -1000,6 +998,7 @@ function setVisual()
     maxDT.style.display = "none";
     maxDTView.style.display = "none";
   }
+
   if (wantMinDB.checked == true)
   {
     minDb.style.display = "";
@@ -1010,6 +1009,7 @@ function setVisual()
     minDb.style.display = "none";
     minDbView.style.display = "none";
   }
+
   if (wantMinFreq.checked == true)
   {
     minFreq.style.display = "";
@@ -1020,6 +1020,7 @@ function setVisual()
     minFreq.style.display = "none";
     minFreqView.style.display = "none";
   }
+
   if (wantMaxFreq.checked == true)
   {
     maxFreq.style.display = "";
@@ -1062,20 +1063,40 @@ function setVisual()
   }
 
   if (window.opener.g_callsignLookups.eqslUseEnable == true)
-  { useseQSLDiv.style.display = ""; }
+  {
-  else useseQSLDiv.style.display = "none";
+    useseQSLDiv.style.display = ""; 
+  }
+  else
+  {
+    useseQSLDiv.style.display = "none";
+  }
 
   if (window.opener.g_callsignLookups.oqrsUseEnable == true)
-  { usesOQRSDiv.style.display = ""; }
+  {
-  else usesOQRSDiv.style.display = "none";
+    usesOQRSDiv.style.display = "";
+  }
+  else
+  {
+    usesOQRSDiv.style.display = "none";
+  }
 
   if (g_rosterSettings.columns.Spot == true)
-  { onlySpotDiv.style.display = ""; }
+  {
-  else onlySpotDiv.style.display = "none";
+    onlySpotDiv.style.display = "";
+  }
+  else
+  {
+    onlySpotDiv.style.display = "none";
+  }
 
   if (g_rosterSettings.callsign == "all" || g_rosterSettings.callsign == "hits")
-  { allOnlyNewDiv.style.display = ""; }
+  {
-  else allOnlyNewDiv.style.display = "none";
+    allOnlyNewDiv.style.display = "";
+  }
+  else
+  {
+    allOnlyNewDiv.style.display = "none";
+  }
 
   resize();
 }
@@ -1135,22 +1156,21 @@ function valuesChanged()
   minFreqView.innerHTML = g_rosterSettings.minFreq = minFreq.value;
   maxFreqView.innerHTML = g_rosterSettings.maxFreq = maxFreq.value;
   g_rosterSettings.maxLoTW = maxLoTW.value;
-  maxLoTWView.innerHTML =
+  maxLoTWView.innerHTML = g_rosterSettings.maxLoTW < 27 ? Number(g_rosterSettings.maxLoTW).toYM() : "<b>&infin;</b>";
-    g_rosterSettings.maxLoTW < 27
-      ? Number(g_rosterSettings.maxLoTW).toYM()
-      : "<b>&infin;</b>";
   g_rosterSettings.maxLoTW = maxLoTW.value;
   g_rosterSettings.cqOnly = cqOnly.checked;
   g_rosterSettings.noMyDxcc = noMyDxcc.checked;
   g_rosterSettings.onlyMyDxcc = onlyMyDxcc.checked;
-  if (
+  if (noMsg.checked && onlyMsg.checked && noMsgValue.value == onlyMsgValue.value)
-    noMsg.checked &&
-    onlyMsg.checked &&
-    noMsgValue.value == onlyMsgValue.value
-  )
   {
-    if (g_rosterSettings.noMsg) noMsg.checked = false;
+    if (g_rosterSettings.noMsg)
-    else onlyMsg.checked = false;
+    {
+      noMsg.checked = false;
+    }
+    else
+    {
+      onlyMsg.checked = false;
+    }
   }
   g_rosterSettings.noMsg = noMsg.checked;
   g_rosterSettings.onlyMsg = onlyMsg.checked;
@@ -1175,6 +1195,11 @@ function valuesChanged()
   window.opener.goProcessRoster();
 }
 
+function filtersChanged()
+{
+
+}
+
 function getBuffer(file_url, callback, flag, mode, port, cookie)
 {
   let url = require("url");

package.nw/lib/roster/renderCompactRoster.js

@@ -3,49 +3,15 @@ function renderCompactRosterHeaders()
   return "<div id=\"buttonsDiv\" style=\"margin-left:0px;white-space:normal;\" onmouseenter='rosterInFocus()' onmouseleave='rosterNoFocus()'>";
 }
 
-function renderCompactRosterRow(callObj)
+function renderCompactRosterRow(callObj, showBand)
 {
-  var thisCall = callObj.DEcall;
+  var ID = callObj.DEcall + callObj.band + callObj.mode;
-  var tt =
+  var title = callObj.RSTsent + "&#13256;, " + parseInt(callObj.dt * 100) + "ms, " + callObj.delta + "hz" + (callObj.grid.length ? ", " + callObj.grid : "") + ", " + (timeNowSec() - callObj.age).toDHMS();
-    callObj.RSTsent +
+  var bandView = showBand ? "<div style='color: #" + window.opener.g_pskColors[callObj.band] + ";float:right;display:inline-block;'>" + callObj.band + "</div>" : "";
-    "&#13256;, " +
+  var worker = "<div class='compact' onClick='initiateQso(\"" + ID + "\")' id='" + ID + "' title='" + title + "' >";
-    parseInt(callObj.dt * 100) +
+  worker += "<div class='compactCallsign' name='Callsign' " + callObj.style.call + " >" + callObj.DEcall.formatCallsign() + bandView + "</div>";
-    "ms, " +
+  worker += "<div class='compactDXCC' name='DXCC (" + callObj.dxcc + ")' " + callObj.style.dxcc + ">" + window.opener.g_dxccToAltName[callObj.dxcc] + "</div>";
-    callObj.delta +
-    "hz" +
-    (callObj.grid.length ? ", " + callObj.grid : "") +
-    ", " +
-    (timeNowSec() - callObj.age).toDHMS();
-  var worker =
-    "<div class='compact' onClick='initiateQso(\"" +
-    thisCall +
-    callObj.band +
-    callObj.mode +
-    "\")' ";
-  worker +=
-    "id='" +
-    thisCall +
-    callObj.band +
-    callObj.mode +
-    "' title='" +
-    tt +
-    "'>";
-  worker +=
-    "<div class='compactCallsign' name='Callsign' " +
-    callObj.style.call +
-    " >" +
-    thisCall.formatCallsign() +
-    "</div>";
-  worker +=
-    "<div class='compactDXCC' name='DXCC (" +
-    callObj.dxcc +
-    ")' " +
-    callObj.style.dxcc +
-    ">" +
-    window.opener.g_dxccToAltName[callObj.dxcc] +
-    "</div>";
   worker += "</div>";
-
   return worker;
 }
 

package.nw/lib/roster/renderRoster.js

@@ -87,17 +87,19 @@ function renderRoster(callRoster, rosterSettings)
   }
 
   window.document.title = `Call Roster: ${countParts.join(" • ")}`;
+  let multiInstance = false;
   if (listShortInstances().length > 0)
   {
     window.document.title += " | " + listShortInstances().join(" • ");
+    multiInstance = true;
   }
-
+  let multiBand = Object.keys(rosterSettings.bands).length > 1;
-  let showBands = (Object.keys(rosterSettings.bands).length > 1) || g_rosterSettings.columns.Band;
+  let showBands = multiBand || g_rosterSettings.columns.Band;
   let showModes = (Object.keys(rosterSettings.modes).length > 1) || g_rosterSettings.columns.Mode;
 
-  columnOverrides.Band = showBands
+  columnOverrides.Band = showBands;
-  columnOverrides.Mode = showModes
+  columnOverrides.Mode = showModes;
-  const rosterColumns = rosterColumnList(g_rosterSettings.columns, columnOverrides)
+  const rosterColumns = rosterColumnList(g_rosterSettings.columns, columnOverrides);
 
   if (g_rosterSettings.compact)
   {
@@ -108,7 +110,7 @@ function renderRoster(callRoster, rosterSettings)
     sortCallList(visibleCallList, g_rosterSettings.sortColumn, g_rosterSettings.sortReverse);
   }
 
-  let worker = g_rosterSettings.compact ? renderCompactRosterHeaders() : renderNormalRosterHeaders(rosterColumns)
+  let worker = g_rosterSettings.compact ? renderCompactRosterHeaders() : renderNormalRosterHeaders(rosterColumns);
 
   // Third loop: render all rows
   for (let x in visibleCallList)
@@ -133,10 +135,10 @@ function renderRoster(callRoster, rosterSettings)
       }
     }
 
-    worker += g_rosterSettings.compact ? renderCompactRosterRow(callObj) : renderNormalRosterRow(rosterColumns, callObj)
+    worker += g_rosterSettings.compact ? renderCompactRosterRow(callObj, multiInstance || multiBand) : renderNormalRosterRow(rosterColumns, callObj);
   }
 
-  worker += g_rosterSettings.compact ? renderCompactRosterFooter() : renderNormalRosterFooter()
+  worker += g_rosterSettings.compact ? renderCompactRosterFooter() : renderNormalRosterFooter();
 
   RosterTable.innerHTML = worker;
 }

package.nw/lib/roster/rosterColumns.js

@@ -75,7 +75,7 @@ const ROSTER_COLUMNS = {
   },
 
   Band: {
-    compare: false,
+    compare: callObjSimpleComparer("band"),
     tableData: (callObj) => ({
       style: `color: #${window.opener.g_pskColors[callObj.band]};`,
       html: callObj.band
@@ -83,7 +83,7 @@ const ROSTER_COLUMNS = {
   },
 
   Mode: {
-    compare: false,
+    compare: callObjSimpleComparer("mode"),
     tableData: (callObj) => ({
       style: `color: #${g_modeColors[callObj.mode] || "888888"};`,
       html: callObj.mode
@@ -379,7 +379,7 @@ const ROSTER_COLUMNS = {
   },
 
   POTA: {
-    compare: false,
+    compare: callObjSimpleComparer("pota"),
     tableData: (callObj) => ({
       name: "POTA",
       rawAttrs: callObj.style.pota,