deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

Merge pull request #3471 from isaacl/fixClockEmerg

Browse source 
Calculate emerg class each tick
This commit is contained in:
Thibault Duplessis 2017-08-18 14:19:59 -05:00 committed by GitHub
parent e794fbf152 d61e59cb2d
commit b77467633d
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ui/round/src/clock/clockCtrl.ts
View file

@ -37,6 +37,7 @@ type ColorMap<T> = { [C in Color]: T };
export interface ClockElements {
time?: HTMLElement;
clock?: HTMLElement;
bar?: HTMLElement;
}

8
ui/round/src/clock/clockView.ts
View file

@ -13,7 +13,9 @@ export function renderClock(ctrl: RoundController, player: Player, position: Pos
isPlayer = ctrl.data.player.color === player.color,
isRunning = player.color === clock.times.activeColor;
const update = (el: HTMLElement) => {
clock.elements[player.color].time = el;
const els = clock.elements[player.color]
els.time = el;
els.clock = el.parentElement!;
el.innerHTML = formatClockTime(clock.showTenths, millis, isRunning);
}
return h('div.clock.clock_' + player.color + '.clock_' + position, {
@ -83,6 +85,10 @@ function showBar(ctrl: ClockController, els: ClockElements, millis: Millis, bers
export function updateElements(clock: ClockController, els: ClockElements, millis: Millis) {
if (els.time) els.time.innerHTML = formatClockTime(clock.showTenths, millis, true);
if (els.bar) els.bar.style.width = clock.timePercent(millis) + '%';
if (els.clock) {
if (millis < clock.emergMs) els.clock.classList.add("emerg");
else els.clock.classList.remove("emerg");
}
}
function showBerserk(ctrl: RoundController, color: Color): boolean {