X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Futils%2FtimeControl.js;h=6d47aac896fdb167b7f598a06c5e88d355866f86;hb=714680114508183fba2c07231dbe8f90b5631b81;hp=194deaf695432e8939e7a8f77889df3039342528;hpb=e64c6f67185b45b3b1205069532362c1bf9680db;p=vchess.git diff --git a/client/src/utils/timeControl.js b/client/src/utils/timeControl.js index 194deaf6..6d47aac8 100644 --- a/client/src/utils/timeControl.js +++ b/client/src/utils/timeControl.js @@ -20,17 +20,17 @@ function isLargerUnit(unit1, unit2) || (unit1 == 'm' && unit2 == 's'); } -export function extractTime(timeControl) +export function extractTime(cadence) { - let tcParts = timeControl.replace(/ /g,"").split('+'); + let tcParts = cadence.replace(/ /g,"").split('+'); // Concatenate usual time control suffixes, in case of none is provided tcParts[0] += "m"; tcParts[1] += "s"; - const mainTimeArray = tcParts[0].match(/([0-9]+)([smhd]+)/); + const mainTimeArray = tcParts[0].match(/([0-9]+)([smhd]+)/); if (!mainTimeArray) return null; const mainTimeValue = parseInt(mainTimeArray[1]); - const mainTimeUnit = mainTimeArray[2]; + const mainTimeUnit = mainTimeArray[2][0]; const mainTime = timeUnitToSeconds(mainTimeValue, mainTimeUnit); let increment = 0; if (tcParts.length >= 2) @@ -39,7 +39,7 @@ export function extractTime(timeControl) if (!incrementArray) return null; const incrementValue = parseInt(incrementArray[1]); - const incrementUnit = incrementArray[2]; + const incrementUnit = incrementArray[2][0]; // Increment unit cannot be larger than main unit: if (isLargerUnit(incrementUnit, mainTimeUnit)) return null;