Merge branch 'cardcount' of git://github.com/Arc676/KgF into Arc676-cardcount

RealFloorIsJava · RealFloorIsJava · commit 697f0c213ec8 · 2018-01-26T11:57:16.000+01:00
diff --git a/src/res/js/match/match.js b/src/res/js/match/match.js
@@ -66,6 +66,8 @@
     allowChoose = data.allowChoose
     allowPick = data.allowPick
     isSpectator = data.isSpectator
+    $("#cardcount").html("Selected: " + numSelected + "/" + numGaps);
+
     if (isSpectator) {
       $(".match-hand").addClass("invisible")
     }
diff --git a/src/res/tpl/match.html b/src/res/tpl/match.html
@@ -38,6 +38,9 @@
             <div class="countdown-clock" id="countdown">
               00:00
             </div>
+			<div id="cardcount">
+				(No cards to select)
+			</div>
             <div class="card-base system-card sticky-card" id="match-statement">
               Waiting...
             </div>

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,8 @@`
`66`	`66`	`allowChoose = data.allowChoose`
`67`	`67`	`allowPick = data.allowPick`
`68`	`68`	`isSpectator = data.isSpectator`
	`69`	`+ $("#cardcount").html("Selected: " + numSelected + "/" + numGaps);`
	`70`	`+`
`69`	`71`	`if (isSpectator) {`
`70`	`72`	`$(".match-hand").addClass("invisible")`
`71`	`73`	`}`