fix regex bugs

domlet · Jul 8, 2024 · 0f14a23 · 0f14a23
1 parent 483b0d9
commit 0f14a23
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/index.html b/index.html
@@ -13,6 +13,7 @@
   <script type="text/javascript" src="data/SY2425.js"></script>
   <script type="text/javascript" src="data/SY2526.js"></script>
   <script src="script/jquery-3.7.1.min.js"></script>
+
 </head>
 
 <body>

diff --git a/script/script.js b/script/script.js
@@ -100,7 +100,6 @@ function drawDots(schoolYear) {
     // 6 terms
     // Draw filled dots (for elapsed days)
     dotsHtml = "";
-    console.log(schoolYear.terms[0].termDaysElapsed);
     for (let x = 0; x < schoolYear.terms[i].termDaysElapsed; x++) {
       let date = schoolYear.terms[i].beg;
       let dateCute = date.toLocaleString("en-US", dotsDateOptions); // Tooltip

diff --git a/script/scriptEventLists.js b/script/scriptEventLists.js
@@ -112,10 +112,15 @@ function showEvents(eventsArray) {
         /<[^>]*>/g,
         ""
       );
-      // add spaces after periods
+      // add spaces after '.' (except .com...)
       eventsArray[i].description = eventsArray[i].description.replace(
-        /\.(\S)/g,
-        ". $1"
+        /\.(?!\s|co\b|org\b|net\b)/g,
+        ". "
+      );
+      // add spaces after ':' (except '://')
+      eventsArray[i].description = eventsArray[i].description.replace(
+        /\:(?!\s|\/\/\b)/g,
+        ": "
       );
     }
     // truncate any long titles or desc
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ @@
       <script type="text/javascript" src="data/SY2425.js"></script>
       <script type="text/javascript" src="data/SY2526.js"></script>
       <script src="script/jquery-3.7.1.min.js"></script>
     </head>
     <body>
@@ Expand Down @@