Merge pull request #396 from rollerderby/lead-p2

Don't show jammers when clocks aren't running.
rollerderby · Nov 26, 2019 · a58a72f · a58a72f
2 parents d483c46 + 0f3f6aa
commit a58a72f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/html/views/common.js b/html/views/common.js
@@ -11,14 +11,17 @@ function jammer(k, v) {
 	var inJam = isTrue(WS.state["ScoreBoard.InJam"]);
 
 	if (jammerName == null || jammerName == "") {
-		jammerName = (leadJammer && inJam) ? "Lead" : "";
+		jammerName = leadJammer ? "Lead" : "";
 	if (pivotName == null)
 		pivotName = "";
 	}
 
 	var jn = !starPass ? jammerName : pivotName;
+	if (!inJam) {
+		jn = "";  // When no clocks are running, do not show jammer names.
+	};
 	$(".Team" + id + " .Lead").toggleClass("HasLead", (leadJammer && !starPass));
-	$(".Team" + id).toggleClass("HasJammerName", (jn != "" && jn != null));
+	$(".Team" + id).toggleClass("HasJammerName", (jn != ""));
 	return jn
 }