Merge pull request #29 from DaniloNovakovic/v2

v2.4.1 - fixed yt playlist regexp popup suggestion
DaniloNovakovic · Nov 1, 2018 · 28faf41 · 28faf41
2 parents 700c9eb + dfdff11
commit 28faf41
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chrome-dynamic-bookmarks",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Chrome extension which dynamically updates bookmarks based on the specified regular expression.",
   "scripts": {
     "dev": "webpack --mode development",

diff --git a/src/js/popup/index.js b/src/js/popup/index.js
@@ -28,14 +28,17 @@ document.addEventListener('DOMContentLoaded', function() {
       if (urlInput) {
         urlInput.value = url;
       }
-      if (/youtube\.com\/.*list=\w+/.test(url)) {
-        const regExpString = url.match(/list=\w+/i);
-        regExpInput.value = `youtube\.com\/.*${regExpString}`;
+      if (/youtube\.com\/.*list=[a-z0-9-]+/i.test(url)) {
+        const regExpString = url.match(/list=[a-z0-9-]+/i);
+        regExpInput.value = `youtube\\.com/.*${regExpString}`;
       } else {
         const subUrl = url.match(/^(http[s]?:\/\/)?(.*\/)|(.*$)/);
         if (subUrl) {
-          const regExpString = subUrl[0].replace(/http[s]?:\/\/(www\.)?/, '');
-          regExpInput.value = `${regExpString.replace(/[.]/g, `\.`)}.*`;
+          const regExpString = subUrl[0].replace(
+            /^(http[s]?:\/\/)?(www\.)?/,
+            ''
+          );
+          regExpInput.value = `${regExpString.replace(/\./g, `\\.`)}.*`;
         }
       }
       M.updateTextFields();

diff --git a/src/manifest.json b/src/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Dynamic Bookmarks",
   "description": "Chrome extension which dynamically updates bookmarks based on the specified regular expression.",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "permissions": ["tabs", "bookmarks", "storage"],
   "background": {
     "page": "background.html"