Some bugs fixes. TODO: double disconnect when anonymous reloads page in Hall

[vchess.git] / client / src / utils / timeControl.js

diff --git a/client/src/utils/timeControl.js b/client/src/utils/timeControl.js
index 3f5a650..72d5557 100644 (file)
--- a/client/src/utils/timeControl.js
+++ b/client/src/utils/timeControl.js
@@ -20,13 +20,13 @@ 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]);
@@ -35,7 +35,7 @@ export function extractTime(timeControl)
   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]);