🔀 Merge pull request #327 from richardfrost/firefox_mobile_fix

richardfrost · web-flow · commit 03059d6aed89 · 2021-08-20T00:50:46.000-04:00
Fix For Older Firefox for Android Versions
diff --git a/bin/webpack.config.js b/bin/webpack.config.js
@@ -3,6 +3,7 @@ module.exports = {
     eventPage: './src/script/eventPage.ts',
     optionPage: './src/script/optionPage.ts',
     popup: './src/script/popup.ts',
+    showErrors: '/src/script/showErrors.ts',
     webFilter: './src/script/webFilter.ts',
   },
   mode: 'production',
diff --git a/src/script/lib/helper.ts b/src/script/lib/helper.ts
@@ -124,7 +124,31 @@ export function numberToBoolean(value: number): boolean {
 }
 
 export function numberWithCommas(number: number | string): string {
-  return number.toString().replace(/\B(?<!\.\d*)(?=(\d{3})+(?!\d))/g, ',');
+  if (typeof Intl == 'object' && typeof Intl.NumberFormat == 'function') {
+    if (typeof number === 'string') {
+      number = parseInt(number).toString();
+    }
+
+    return number.toLocaleString();
+  } else {
+    number = number.toString();
+
+    // Get numbers before `.` (if present)
+    const decimalIndex = number.indexOf('.');
+    let output = decimalIndex === -1 ? number : number.slice(0, decimalIndex);
+
+    // Insert commas every 3 digits from the right
+    for (let i = output.length - 3; i > 0; i -= 3) {
+      output = output.slice(0, i) + ',' + output.slice(i);
+    }
+
+    // Append fractional part
+    if (decimalIndex !== -1) {
+      output += number.slice(decimalIndex);
+    }
+
+    return output;
+  }
 }
 
 export function readFile(file) {
diff --git a/src/script/showErrors.ts b/src/script/showErrors.ts
@@ -0,0 +1,17 @@
+// Show errors (including syntax) on the page
+// Requires: <body>...<div id="uncaughtErrors"></div></body>
+window.onerror = function(message, source, lineno, colno, error) {
+  const errorContainer = document.querySelector('BODY > #uncaughtErrors') as HTMLDivElement;
+  if (errorContainer) {
+    if (!errorContainer.childElementCount) {
+      const errorHeader = document.createElement('P');
+      errorHeader.textContent = 'Errors:';
+      errorContainer.appendChild(errorHeader);
+    }
+    const errorMessage = document.createElement('P');
+    errorMessage.textContent = message.toString();
+    errorContainer.appendChild(errorMessage);
+  } else {
+    window.alert(message);
+  }
+};
diff --git a/src/static/optionPage.css b/src/static/optionPage.css
@@ -193,3 +193,12 @@ a#bookmarkletLink:active, a#bookmarkletLink:hover, a#bookmarkletLink:link, a#boo
   left: 0;
   bottom: 18px
 }
+
+/* Uncaught Errors */
+#uncaughtErrors P {
+  color: red;
+}
+
+#uncaughtErrors P:first-child {
+  font-weight: bolder;
+}
diff --git a/src/static/optionPage.html b/src/static/optionPage.html
@@ -812,6 +812,9 @@ <h4 class="sectionHeader">Site Config</h4>
   </div>
 </div>
 
+<div id="uncaughtErrors"></div>
+<script src="showErrors.js"></script>
+
 <script src="optionPage.js"></script>
 </body>
 </html>
diff --git a/src/static/popup.css b/src/static/popup.css
@@ -29,12 +29,6 @@ a:hover, a:active {
   font-size: 10px;
 }
 
-p {
-  margin-right: 35px;
-  margin-top: 40px;
-  float: right;
-}
-
 h4 {
   margin-bottom: 5px;
 }
@@ -210,4 +204,15 @@ input:checked + .slider:before {
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
-}
+}
+
+/* Uncaught Errors */
+#uncaughtErrors P {
+  color: red;
+  font-size: 12px;
+  line-height: 1;
+}
+
+#uncaughtErrors P:first-child {
+  font-weight: bolder;
+}
diff --git a/src/static/popup.html b/src/static/popup.html
@@ -53,6 +53,10 @@
     - <a href="https://github.com/richardfrost/AdvancedProfanityFilter/releases" target="_blank">Changelog</a>
     - <a href="https://github.com/richardfrost/AdvancedProfanityFilter/issues" target="_blank">Support</a>
   </div>
+
+  <div id="uncaughtErrors"></div>
+  <script src="showErrors.js"></script>
+
   <script src="popup.js"></script>
 </body>
 </html>
