Преглед на файлове

fix: wrong console.error usages

Sven преди 1 година
родител
ревизия
2e004f4f63
променени са 7 файла, в които са добавени 29 реда и са изтрити 26 реда
  1. 17 15
      dist/BetterYTM.user.js
  2. 3 3
      src/BetterYTM.user.ts
  3. 2 2
      src/features/input.ts
  4. 2 2
      src/features/layout.ts
  5. 1 1
      src/features/lyrics.ts
  6. 2 1
      src/features/menu/menu.ts
  7. 2 2
      src/utils.ts

+ 17 - 15
dist/BetterYTM.user.js

@@ -486,7 +486,7 @@ const scriptInfo = Object.freeze({
     name: GM.info.script.name,
     version: GM.info.script.version,
     namespace: GM.info.script.namespace,
-    lastCommit: "fab275d", // assert as generic string instead of union
+    lastCommit: "0f3557a", // assert as generic string instead of union
 });
 
 
@@ -740,7 +740,7 @@ function switchSite(newDomain) {
         location.assign(url);
     }
     catch (err) {
-        console.error("Error while switching site:", err);
+        (0,_utils__WEBPACK_IMPORTED_MODULE_0__.error)("Error while switching site:", err);
     }
 }
 //#MARKER beforeunload popup
@@ -863,7 +863,7 @@ function removeUpgradeTab() {
         removeUpgradeTries++;
     }
     else
-        console.error(`Couldn't find upgrade tab to remove after ${removeUpgradeTries} tries`);
+        (0,_utils__WEBPACK_IMPORTED_MODULE_2__.error)(`Couldn't find upgrade tab to remove after ${removeUpgradeTries} tries`);
 }
 //#MARKER volume slider
 /** Sets the volume slider to a set size */
@@ -964,7 +964,7 @@ function addMediaCtrlGeniusBtn() {
             mcLyricsButtonAddTries++;
             if (mcLyricsButtonAddTries < _constants__WEBPACK_IMPORTED_MODULE_0__.triesLimit)
                 return setTimeout(addMediaCtrlGeniusBtn, _constants__WEBPACK_IMPORTED_MODULE_0__.triesInterval); // TODO: improve this
-            return console.error(`Couldn't find element to append lyrics buttons to after ${mcLyricsButtonAddTries} tries`);
+            return (0,_utils__WEBPACK_IMPORTED_MODULE_1__.error)(`Couldn't find element to append lyrics buttons to after ${mcLyricsButtonAddTries} tries`);
         }
         const songTitleElem = document.querySelector(".content-info-wrapper > yt-formatted-string");
         const gUrl = yield getCurrentGeniusUrl();
@@ -1121,9 +1121,11 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   setActiveTab: function() { return /* binding */ setActiveTab; }
 /* harmony export */ });
 /* harmony import */ var _constants__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../constants */ "./src/constants.ts");
-/* harmony import */ var _changelog_md__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../../changelog.md */ "./changelog.md");
-/* harmony import */ var _menu_html__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./menu.html */ "./src/features/menu/menu.html");
-/* harmony import */ var _menu_css__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./menu.css */ "./src/features/menu/menu.css");
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../utils */ "./src/utils.ts");
+/* harmony import */ var _changelog_md__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../changelog.md */ "./changelog.md");
+/* harmony import */ var _menu_html__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./menu.html */ "./src/features/menu/menu.html");
+/* harmony import */ var _menu_css__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./menu.css */ "./src/features/menu/menu.css");
+
 
 
 
@@ -1145,7 +1147,7 @@ function initMenu() {
         const menuContainer = document.createElement("div");
         menuContainer.id = "bytm-menu-container";
         // add menu html
-        menuContainer.innerHTML = _menu_html__WEBPACK_IMPORTED_MODULE_2__["default"];
+        menuContainer.innerHTML = _menu_html__WEBPACK_IMPORTED_MODULE_3__["default"];
         document.body.appendChild(menuContainer);
         initMenuContents();
     });
@@ -1156,7 +1158,7 @@ function initMenuContents() {
     if (!document.querySelector("#bytm-menu-dialog"))
         return menuContTries++ < _constants__WEBPACK_IMPORTED_MODULE_0__.triesLimit
             ? setTimeout(initMenuContents, _constants__WEBPACK_IMPORTED_MODULE_0__.triesInterval)
-            : console.error(`couldn't create menu element after ${_constants__WEBPACK_IMPORTED_MODULE_0__.triesLimit} tries.`);
+            : (0,_utils__WEBPACK_IMPORTED_MODULE_1__.error)(`couldn't create menu element after ${_constants__WEBPACK_IMPORTED_MODULE_0__.triesLimit} tries.`);
     // hook events
     for (const tab in tabsSelectors) {
         const selector = tabsSelectors[tab];
@@ -1201,7 +1203,7 @@ function initInfoContent() {
 }
 function initChangelogContent() {
     const tab = document.querySelector("#bytm-menu-tab-changelog-content");
-    tab.innerHTML = _changelog_md__WEBPACK_IMPORTED_MODULE_1__["default"];
+    tab.innerHTML = _changelog_md__WEBPACK_IMPORTED_MODULE_2__["default"];
 }
 
 
@@ -1663,7 +1665,7 @@ function getVideoTime(force = false) {
         return null;
     }
     catch (err) {
-        console.error("Couldn't get video time due to error:", err);
+        error("Couldn't get video time due to error:", err);
         return null;
     }
 }
@@ -1747,7 +1749,7 @@ function initSiteEvents() {
         ];
     }
     catch (err) {
-        console.error("Couldn't initialize SiteEvents observers due to an error:\n", err);
+        error("Couldn't initialize SiteEvents observers due to an error:\n", err);
     }
 }
 /** Disconnects and deletes all observers. Run `initSiteEvents()` again to create new ones. */
@@ -1850,7 +1852,7 @@ function init() {
             document.addEventListener("DOMContentLoaded", onDomLoad);
         }
         catch (err) {
-            console.error("BetterYTM - General Error:", err);
+            console.error(`${_constants__WEBPACK_IMPORTED_MODULE_1__.scriptInfo.name} - General Error:`, err);
         }
         try {
             (0,_features_index__WEBPACK_IMPORTED_MODULE_3__.initMenu)();
@@ -2001,12 +2003,12 @@ function onDomLoad() {
                     (0,_features_index__WEBPACK_IMPORTED_MODULE_3__.addMenu)(); // TODO: remove
                 }
                 catch (err) {
-                    console.error("Couldn't add menu:", err);
+                    (0,_utils__WEBPACK_IMPORTED_MODULE_2__.error)("Couldn't add menu:", err);
                 }
             }
         }
         catch (err) {
-            console.error("General error while executing feature:", err);
+            (0,_utils__WEBPACK_IMPORTED_MODULE_2__.error)("General error while executing feature:", err);
         }
     });
 }

+ 3 - 3
src/BetterYTM.user.ts

@@ -27,7 +27,7 @@ async function init() {
     document.addEventListener("DOMContentLoaded", onDomLoad);
   }
   catch(err) {
-    console.error("BetterYTM - General Error:", err);
+    console.error(`${scriptInfo.name} - General Error:`, err);
   }
 
   try {
@@ -83,12 +83,12 @@ async function onDomLoad() {
         addMenu(); // TODO: remove
       }
       catch(err) {
-        console.error("Couldn't add menu:", err);
+        error("Couldn't add menu:", err);
       }
     }
   }
   catch(err) {
-    console.error("General error while executing feature:", err);
+    error("General error while executing feature:", err);
   }
 }
 

+ 2 - 2
src/features/input.ts

@@ -1,4 +1,4 @@
-import { getVideoTime, info, log, warn } from "../utils";
+import { error, getVideoTime, info, log, warn } from "../utils";
 import type { Domain } from "../types";
 import { getFeatures } from "../config";
 
@@ -121,7 +121,7 @@ function switchSite(newDomain: Domain) {
     location.assign(url);
   }
   catch(err) {
-    console.error("Error while switching site:", err);
+    error("Error while switching site:", err);
   }
 }
 

+ 2 - 2
src/features/layout.ts

@@ -1,6 +1,6 @@
 import { scriptInfo, triesInterval, triesLimit } from "../constants";
 import { getFeatures } from "../config";
-import { addGlobalStyle, insertAfter, log, siteEvents } from "../utils";
+import { addGlobalStyle, error, insertAfter, log, siteEvents } from "../utils";
 import type { FeatureConfig } from "../types";
 import { openMenu } from "./menu/menu_old";
 import "./layout.css";
@@ -45,7 +45,7 @@ export function removeUpgradeTab() {
     removeUpgradeTries++;
   }
   else
-    console.error(`Couldn't find upgrade tab to remove after ${removeUpgradeTries} tries`);
+    error(`Couldn't find upgrade tab to remove after ${removeUpgradeTries} tries`);
 }
 
 //#MARKER volume slider

+ 1 - 1
src/features/lyrics.ts

@@ -19,7 +19,7 @@ export async function addMediaCtrlGeniusBtn(): Promise<unknown> {
     if(mcLyricsButtonAddTries < triesLimit)
       return setTimeout(addMediaCtrlGeniusBtn, triesInterval); // TODO: improve this
 
-    return console.error(`Couldn't find element to append lyrics buttons to after ${mcLyricsButtonAddTries} tries`);
+    return error(`Couldn't find element to append lyrics buttons to after ${mcLyricsButtonAddTries} tries`);
   }
 
   const songTitleElem = document.querySelector(".content-info-wrapper > yt-formatted-string") as HTMLDivElement;

+ 2 - 1
src/features/menu/menu.ts

@@ -1,4 +1,5 @@
 import { triesInterval, triesLimit } from "../../constants";
+import { error } from "../../utils";
 import changelogContent from "../../../changelog.md";
 import menuContent from "./menu.html";
 import "./menu.css";
@@ -36,7 +37,7 @@ function initMenuContents(): unknown {
   if(!document.querySelector("#bytm-menu-dialog"))
     return menuContTries++ < triesLimit
       ? setTimeout(initMenuContents, triesInterval)
-      : console.error(`couldn't create menu element after ${triesLimit} tries.`);
+      : error(`couldn't create menu element after ${triesLimit} tries.`);
 
   // hook events
   for(const tab in tabsSelectors) {

+ 2 - 2
src/utils.ts

@@ -103,7 +103,7 @@ export function getVideoTime(force = false) {
     return null;
   }
   catch(err) {
-    console.error("Couldn't get video time due to error:", err);
+    error("Couldn't get video time due to error:", err);
     return null;
   }
 }
@@ -218,7 +218,7 @@ export function initSiteEvents() {
     ];
   }
   catch(err) {
-    console.error("Couldn't initialize SiteEvents observers due to an error:\n", err);
+    error("Couldn't initialize SiteEvents observers due to an error:\n", err);
   }
 }