Updates

LeeWannacott · May 9, 2023 · d8331d1 · d8331d1
1 parent 520d0b9
commit d8331d1
Showing 1 changed file with 34 additions and 20 deletions.
diff --git a/table-sort.js b/table-sort.js
@@ -161,7 +161,9 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) {
       };
       const numberWithUnitType = /([.0-9]+)\s?(B|KB|KiB|MB|MiB|GB|GiB|TB|TiB)/i;
       for (let [i, tr] of tableRows.entries()) {
-        let fileSizeTd = tr.querySelectorAll("td").item(columnIndex).innerText;
+        let fileSizeTd = tr
+          .querySelectorAll("td")
+          .item(columnIndex).textContent;
         let match = fileSizeTd.match(numberWithUnitType);
         if (match) {
           let number = parseFloat(match[1]);
@@ -175,28 +177,40 @@ function tableSortJs(testingTableSortJS = false, domDocumentWindow = document) {
     }
 
     function sortByRuntime(tableRows, columnData) {
-      for (let [i, tr] of tableRows.entries()) {
-        const regexMinutesAndSeconds = /^(\d+h)?\s?(\d+m)?\s?(\d+s)?$/i;
-        let columnOfTd = tr.querySelectorAll("td").item(columnIndex).innerText;
-        let match = columnOfTd.match(regexMinutesAndSeconds);
-        let [minutesInSeconds, hours, seconds, timeinSeconds] = [0, 0, 0, 0];
-        if (match) {
-          const regexHours = match[1];
-          if (regexHours) {
-            hours = Number(regexHours.replace("h", "")) * 60 * 60;
-          }
-          const regexMinutes = match[2];
-          if (regexMinutes) {
-            minutesInSeconds = Number(regexMinutes.replace("m", "")) * 60;
+      try {
+        for (let [i, tr] of tableRows.entries()) {
+          const regexMinutesAndSeconds = /^(\d+h)?\s?(\d+m)?\s?(\d+s)?$/i;
+          let columnOfTd = "";
+          // TODO: github actions runtime didn't like textContent, tests didn't like innerText?
+          if (testingTableSortJS) {
+            columnOfTd = tr
+              .querySelectorAll("td")
+              .item(columnIndex).textContent;
+          } else {
+            columnOfTd = tr.querySelectorAll("td").item(columnIndex).innerText;
           }
-          const regexSeconds = match[3];
-          if (regexSeconds) {
-            seconds = Number(regexSeconds.replace("s", ""));
+          let match = columnOfTd.match(regexMinutesAndSeconds);
+          let [minutesInSeconds, hours, seconds, timeinSeconds] = [0, 0, 0, 0];
+          if (match) {
+            const regexHours = match[1];
+            if (regexHours) {
+              hours = Number(regexHours.replace("h", "")) * 60 * 60;
+            }
+            const regexMinutes = match[2];
+            if (regexMinutes) {
+              minutesInSeconds = Number(regexMinutes.replace("m", "")) * 60;
+            }
+            const regexSeconds = match[3];
+            if (regexSeconds) {
+              seconds = Number(regexSeconds.replace("s", ""));
+            }
+            timeinSeconds = hours + minutesInSeconds + seconds;
           }
-          timeinSeconds = hours + minutesInSeconds + seconds;
+          columnData.push(`${timeinSeconds}#${i}`);
+          columnIndexAndTableRow[columnData[i]] = tr.innerHTML;
         }
-        columnData.push(`${timeinSeconds}#${i}`);
-        columnIndexAndTableRow[columnData[i]] = tr.innerHTML;
+      } catch (e) {
+        console.log(e);
       }
     }