@pronto-tools-and-more/custom-js-functions 12.4.0 → 12.6.0

package/dist/main.js

@@ -405,6 +405,7 @@
   // src/parts/Functions/Functions.ts
   var Functions_exports = {};
   __export(Functions_exports, {
+    bookmarkIdString: () => bookmarkIdString,
     dateHelper: () => dateHelper,
     debugId: () => debugId,
     getPrimaryCategoryProperty: () => getPrimaryCategoryProperty,
@@ -422,6 +423,11 @@
   var import_it = __toESM(require_it(), 1);
   var dateHelper = import_dayjs.default;
 
+  // src/parts/FunctionBookmarkIdString/FunctionBookmarkIdString.ts
+  var bookmarkIdString = (bookmarks) => {
+    return `^(${bookmarks.join("|")})`;
+  };
+
   // src/parts/FunctionDebugId/FunctionDebugId.ts
   var debugId = (content, ...keys) => {
     let current = content;
@@ -429,7 +435,7 @@
       console.log({ content, key });
       current = current?.[key];
     }
-    return current;
+    return current || "";
   };
 
   // src/parts/FunctionId/FunctionId.ts
@@ -438,7 +444,7 @@
     for (const key of keys) {
       current = current?.[key];
     }
-    return current;
+    return current || "";
   };
 
   // src/parts/GetCategoryProperty/GetCategoryProperty.ts
@@ -513,7 +519,7 @@
   };
 
   // src/parts/BookmarksKey/BookmarksKey.ts
-  var bookmarksKey = "bookmarks-v2";
+  var bookmarksKey = "bookmarks-v3";
 
   // src/parts/GetBookmarkedArticles/GetBookmarkedArticles.ts
   var getBookmarkedArticles = () => {
@@ -619,11 +625,26 @@
       }
       return true;
     });
+    const $Element = document.querySelector(
+      `[data-bookmark-article-id="${info.id}"]`
+    );
+    const shouldConfirm = $Element && $Element.closest(".BookmarkContent");
+    if (shouldConfirm) {
+      const reallyDelete = confirm(
+        "Sind Sie Sicher, dass Sie das Lesezeichen l\xF6schen m\xF6chten"
+      );
+      if (!reallyDelete) {
+        return;
+      }
+    }
     localStorage.setItem(bookmarksKey, JSON.stringify(newBookmarks));
-    const $Element = document.querySelector(`[data-article-id="${info.id}"]`);
     if ($Element && $Element instanceof HTMLElement) {
       $Element.dataset.bookmarked = "false";
     }
+    if (shouldConfirm) {
+      const $Parent = $Element?.closest(".ArticleTeaser");
+      $Parent?.remove();
+    }
   };
 
   // src/parts/EnableBookmark/EnableBookmark.ts
@@ -631,14 +652,27 @@
     const bookmarks = getBookmarkedArticles();
     const newBookmarks = [...bookmarks, info];
     localStorage.setItem(bookmarksKey, JSON.stringify(newBookmarks));
-    const $Element = document.querySelector(`[data-article-id="${info.id}"]`);
+    const $Element = document.querySelector(
+      `[data-bookmark-article-id="${info.id}"]`
+    );
     if ($Element && $Element instanceof HTMLElement) {
       $Element.dataset.bookmarked = "true";
     }
   };
 
   // src/parts/ToggleBookmarkArticle/ToggleBookmarkArticle.ts
-  var toggleBookmarkArticle = (info) => {
+  var toggleBookmarkArticle = (node) => {
+    const info = {
+      id: node.dataset.bookmarkArticleId,
+      name: node.dataset.bookmarkArticleName,
+      description: node.dataset.bookmarkArticleDescription,
+      imageSrc: node.dataset.bookmarkArticleImagesrc,
+      slug: node.dataset.bookmarkArticleSlug,
+      metadataVideoPodcast: node.dataset.bookmarkArticleMetadatavideopodcast,
+      readTime: node.dataset.bookmarkArticleReadtime,
+      primaryCategoryId: node.dataset.bookmarkArticlePrimarycategoryid,
+      primaryCategoryName: node.dataset.bookmarkArticlePrimarycategoryname
+    };
     if (isBookmarked(info.id)) {
       disableBookmark(info);
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pronto-tools-and-more/custom-js-functions",
-  "version": "12.4.0",
+  "version": "12.6.0",
   "description": "",
   "main": "dist/main.js",
   "type": "module",

package/src/parts/BookmarksKey/BookmarksKey.ts

@@ -1,2 +1,2 @@
 // TODO version this
-export const bookmarksKey = "bookmarks-v2";
+export const bookmarksKey = "bookmarks-v3";

package/src/parts/DisableBookmark/DisableBookmark.ts

@@ -9,10 +9,25 @@ export const disableBookmark = (info) => {
     }
     return true;
   });
+  const $Element = document.querySelector(
+    `[data-bookmark-article-id="${info.id}"]`
+  );
+  const shouldConfirm = $Element && $Element.closest(".BookmarkContent");
+  if (shouldConfirm) {
+    const reallyDelete = confirm(
+      "Sind Sie Sicher, dass Sie das Lesezeichen löschen möchten"
+    );
+    if (!reallyDelete) {
+      return;
+    }
+  }
   localStorage.setItem(bookmarksKey, JSON.stringify(newBookmarks));
-  const $Element = document.querySelector(`[data-article-id="${info.id}"]`);
 
   if ($Element && $Element instanceof HTMLElement) {
     $Element.dataset.bookmarked = "false";
   }
+  if (shouldConfirm) {
+    const $Parent = $Element?.closest(".ArticleTeaser");
+    $Parent?.remove();
+  }
 };

package/src/parts/EnableBookmark/EnableBookmark.ts

@@ -5,7 +5,9 @@ export const enableBookmark = (info) => {
   const bookmarks = getBookmarkedArticles();
   const newBookmarks = [...bookmarks, info];
   localStorage.setItem(bookmarksKey, JSON.stringify(newBookmarks));
-  const $Element = document.querySelector(`[data-article-id="${info.id}"]`);
+  const $Element = document.querySelector(
+    `[data-bookmark-article-id="${info.id}"]`
+  );
   if ($Element && $Element instanceof HTMLElement) {
     $Element.dataset.bookmarked = "true";
   }

package/src/parts/FunctionBookmarkIdString/FunctionBookmarkIdString.ts

@@ -0,0 +1,3 @@
+export const bookmarkIdString = (bookmarks) => {
+  return `^(${bookmarks.join("|")})`;
+};

package/src/parts/FunctionDebugId/FunctionDebugId.ts

@@ -4,5 +4,5 @@ export const debugId = (content, ...keys) => {
     console.log({ content, key });
     current = current?.[key];
   }
-  return current;
+  return current || "";
 };

package/src/parts/FunctionId/FunctionId.ts

@@ -3,5 +3,5 @@ export const id = (content, ...keys) => {
   for (const key of keys) {
     current = current?.[key];
   }
-  return current;
+  return current || "";
 };

package/src/parts/Functions/Functions.ts

@@ -1,4 +1,5 @@
 export * from "../DateHelper/DateHelper.ts";
+export * from "../FunctionBookmarkIdString/FunctionBookmarkIdString.ts";
 export * from "../FunctionDebugId/FunctionDebugId.ts";
 export * from "../FunctionId/FunctionId.ts";
 export * from "../GetCategoryProperty/GetCategoryProperty.ts";

package/src/parts/ToggleBookmarkArticle/ToggleBookmarkArticle.ts

@@ -2,7 +2,18 @@ import { disableBookmark } from "../DisableBookmark/DisableBookmark.ts";
 import { enableBookmark } from "../EnableBookmark/EnableBookmark.ts";
 import { isBookmarked } from "../IsBookmarked/IsBookmarked.ts";
 
-export const toggleBookmarkArticle = (info) => {
+export const toggleBookmarkArticle = (node: any) => {
+  const info = {
+    id: node.dataset.bookmarkArticleId,
+    name: node.dataset.bookmarkArticleName,
+    description: node.dataset.bookmarkArticleDescription,
+    imageSrc: node.dataset.bookmarkArticleImagesrc,
+    slug: node.dataset.bookmarkArticleSlug,
+    metadataVideoPodcast: node.dataset.bookmarkArticleMetadatavideopodcast,
+    readTime: node.dataset.bookmarkArticleReadtime,
+    primaryCategoryId: node.dataset.bookmarkArticlePrimarycategoryid,
+    primaryCategoryName: node.dataset.bookmarkArticlePrimarycategoryname,
+  };
   if (isBookmarked(info.id)) {
     disableBookmark(info);
   } else {