|| (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]);
let increment = 0;
if (tcParts.length >= 2)
{
- const incrementArray = tcParts[1].match(/([0-9]+)([smhd]+)/);
+ const incrementArray = tcParts[1].match(/^([0-9]+)([smhd]+)$/);
if (!incrementArray)
return null;
const incrementValue = parseInt(incrementArray[1]);