Added page type for fallback newtab page

Signed-off-by: Philipp <p.koenig@blockbyte.de>
Kiuryy · Apr 25, 2018 · 8da6d96 · 8da6d96
1 parent ef1cbc4
commit 8da6d96
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/dist/css/changelog.css b/dist/css/changelog.css
diff --git a/dist/css/newtab.css b/dist/css/newtab.css
diff --git a/dist/css/onboarding.css b/dist/css/onboarding.css
diff --git a/dist/css/overlay.css b/dist/css/overlay.css
diff --git a/dist/css/settings.css b/dist/css/settings.css
diff --git a/dist/css/sidebar.css b/dist/css/sidebar.css
diff --git a/dist/js/extension.js b/dist/js/extension.js
diff --git a/src/js/helper/toggle.js b/src/js/helper/toggle.js
@@ -72,7 +72,7 @@
 
             let pageType = getPageType();
 
-            if (((pageType === "newtab_website" || pageType === "newtab_replacement") && data.autoOpen) || data.performReopening) {
+            if (((pageType === "newtab_website" || pageType === "newtab_replacement" || pageType === "newtab_fallback") && data.autoOpen) || data.performReopening) {
                 this.openSidebar();
                 ext.helper.model.setData({"u/performReopening": false});
             }
@@ -123,6 +123,7 @@
                     this.markLastUsed();
                 }
 
+                console.log("/sidebar/" + getPageType());
                 ext.helper.model.call("trackPageView", {page: "/sidebar/" + getPageType()});
                 ext.elements.iframe.addClass(ext.opts.classes.page.visible);
                 ext.initImages();
@@ -348,7 +349,7 @@
             let maskColor = styles.sidebarMaskColor || null;
 
             return !(
-                ((pageType === "newtab_website" || pageType === "newtab_replacement") && newtabAutoOpen)
+                ((pageType === "newtab_website" || pageType === "newtab_replacement" || pageType === "newtab_fallback") && newtabAutoOpen)
                 || pageType === "onboarding"
                 || maskColor === "transparent"
             );
@@ -365,13 +366,14 @@
             let found = false;
 
             Object.entries({
-                newtab_default: ["https?://www\.google\..+/_/chrome/newtab"],
+                newtab_default: ["https?://www\\.google\\..+/_/chrome/newtab"],
+                newtab_fallback: [chrome.extension.getURL("html/newtab.html") + ".*[?&]type=\\w+"],
                 newtab_replacement: [chrome.extension.getURL("html/newtab.html")],
                 newtab_website: [".*[?&]bs_nt=1(&|#|$)"],
                 website: ["https?://"],
-                onboarding: ["chrome\-extension://.*/intro.html"],
+                onboarding: ["chrome\\-extension://.*/intro.html"],
                 chrome: ["chrome://"],
-                extension: ["chrome\-extension://"],
+                extension: ["chrome\\-extension://"],
                 local: ["file://"]
             }).some(([key, patterns]) => {
                 patterns.some((str) => {