Bugfix: local file urls on newtab page

Kiuryy · Mar 1, 2018 · 1e40bd5 · 1e40bd5
1 parent 7f37ba7
commit 1e40bd5
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 32 deletions.
diff --git a/dist/_locales/de/messages.json b/dist/_locales/de/messages.json
diff --git a/dist/_locales/en/messages.json b/dist/_locales/en/messages.json
diff --git a/dist/_locales/ja/messages.json b/dist/_locales/ja/messages.json
diff --git a/dist/_locales/zh_CN/messages.json b/dist/_locales/zh_CN/messages.json
diff --git a/dist/js/extension.js b/dist/js/extension.js
diff --git a/dist/js/lib/utility.js b/dist/js/lib/utility.js
diff --git a/dist/js/newtab.js b/dist/js/newtab.js
diff --git a/src/_locales/de/messages.json b/src/_locales/de/messages.json
@@ -698,12 +698,6 @@
     "settings_sidebar_position_right": {
         "message": "Rechts"
     },
-    "settings_import_saved": {
-        "message": "Konfiguration erfolgreich importiert"
-    },
-    "settings_import_failed": {
-        "message": "Die Konfiguration konnte nicht importiert werden. Bitte w\u00e4hle eine g\u00fcltige Datei aus."
-    },
     "settings_filter_intro": {
         "message": "Wenn die Sidebar nicht auf jeder Seite geladen werden soll, kann hier konfiguriert werden, wo die Erweiterung geladen werden soll (Whitelist) oder wo sie nicht geladen werden soll (Blacklist)."
     },
@@ -743,6 +737,12 @@
     "settings_import": {
         "message": "Konfiguration importieren"
     },
+    "settings_import_saved": {
+        "message": "Konfiguration erfolgreich importiert"
+    },
+    "settings_import_failed": {
+        "message": "Die Konfiguration konnte nicht importiert werden. Bitte w\u00e4hle eine g\u00fcltige Datei aus."
+    },
     "settings_presets": {
         "message": "Voreinstellung"
     },

diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
@@ -698,12 +698,6 @@
     "settings_sidebar_position_right": {
         "message": "Right"
     },
-    "settings_import_saved": {
-        "message": "Configuration imported successfully"
-    },
-    "settings_import_failed": {
-        "message": "Failed to import the configuration. Please choose a valid file."
-    },
     "settings_filter_intro": {
         "message": "If you don't want the sidebar to be loaded on every page, you can configure where to load the extension (whitelist) or where not to (blacklist)."
     },
@@ -743,6 +737,12 @@
     "settings_import": {
         "message": "Import Settings"
     },
+    "settings_import_saved": {
+        "message": "Configuration imported successfully"
+    },
+    "settings_import_failed": {
+        "message": "Failed to import the configuration. Please choose a valid file."
+    },
     "settings_presets": {
         "message": "Preselection"
     },

diff --git a/src/_locales/ja/messages.json b/src/_locales/ja/messages.json
@@ -305,6 +305,12 @@
     "notification_sidebar_not_working_unknown": {
         "message": "\u3053\u308c\u304c\u983b\u7e41\u306b\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u304a\u77e5\u3089\u305b\u304f\u3060\u3055\u3044\u3002"
     },
+    "notification_sidebar_blacklisted": {
+        "message": "\u3053\u306eURL\u306f\u30d6\u30e9\u30c3\u30af\u30ea\u30b9\u30c8\u306b\u767b\u9332\u3055\u308c\u3066\u3044\u308b\u305f\u3081\u3001\u30b5\u30a4\u30c9\u30d0\u30fc\u306f\u8aad\u307f\u8fbc\u307e\u308c\u307e\u305b\u3093\u3002"
+    },
+    "notification_sidebar_not_whitelisted": {
+        "message": "\u3053\u306eURL\u306f\u30db\u30ef\u30a4\u30c8\u30ea\u30b9\u30c8\u306b\u767b\u9332\u3055\u308c\u3066\u3044\u306a\u3044\u305f\u3081\u3001\u30b5\u30a4\u30c9\u30d0\u30fc\u306f\u8aad\u307f\u8fbc\u307e\u308c\u307e\u305b\u3093\u3002"
+    },
     "contribute_headline": {
         "message": "\u624b\u4f1d\u3063\u3066\u3044\u305f\u3060\u3051\u307e\u305b\u3093\u304b\uff1f"
     },
@@ -692,12 +698,6 @@
     "settings_sidebar_position_right": {
         "message": "\u53f3"
     },
-    "settings_import_saved": {
-        "message": "\u8a2d\u5b9a\u304c\u6b63\u5e38\u306b\u30a4\u30f3\u30dd\u30fc\u30c8\u3055\u308c\u307e\u3057\u305f"
-    },
-    "settings_import_failed": {
-        "message": "\u8a2d\u5b9a\u306e\u30a4\u30f3\u30dd\u30fc\u30c8\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 \u6709\u52b9\u306a\u30d5\u30a1\u30a4\u30eb\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002"
-    },
     "settings_filter_intro": {
         "message": "\u30da\u30fc\u30b8\u3092\u958b\u304f\u305f\u3073\u306b\u30b5\u30a4\u30c9\u30d0\u30fc\u3092\u8aad\u307f\u8fbc\u307e\u305b\u305f\u304f\u306a\u3044\u5834\u5408\u3001\u8aad\u307f\u8fbc\u307e\u305b\u308b\u30da\u30fc\u30b8\uff08\u30db\u30ef\u30a4\u30c8\u30ea\u30b9\u30c8\uff09\u3001\u307e\u305f\u306f\u8aad\u307f\u8fbc\u307e\u305b\u305f\u304f\u306a\u3044\u30da\u30fc\u30b8\uff08\u30d6\u30e9\u30c3\u30af\u30ea\u30b9\u30c8\uff09\u3092\u8a2d\u5b9a\u3067\u304d\u307e\u3059"
     },
@@ -737,6 +737,12 @@
     "settings_import": {
         "message": "\u8a2d\u5b9a\u306e\u30a4\u30f3\u30dd\u30fc\u30c8"
     },
+    "settings_import_saved": {
+        "message": "\u8a2d\u5b9a\u304c\u6b63\u5e38\u306b\u30a4\u30f3\u30dd\u30fc\u30c8\u3055\u308c\u307e\u3057\u305f"
+    },
+    "settings_import_failed": {
+        "message": "\u8a2d\u5b9a\u306e\u30a4\u30f3\u30dd\u30fc\u30c8\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 \u6709\u52b9\u306a\u30d5\u30a1\u30a4\u30eb\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002"
+    },
     "settings_presets": {
         "message": "\u4e8b\u524d\u9078\u629e"
     },

diff --git a/src/_locales/zh_CN/messages.json b/src/_locales/zh_CN/messages.json
@@ -698,12 +698,6 @@
     "settings_sidebar_position_right": {
         "message": "\u53f3"
     },
-    "settings_import_saved": {
-        "message": "\u914d\u7f6e\u5bfc\u5165\u6210\u529f"
-    },
-    "settings_import_failed": {
-        "message": "\u914d\u7f6e\u5bfc\u5165\u5931\u8d25\uff0c\u8bf7\u9009\u62e9\u6b63\u786e\u7684\u6587\u4ef6\u3002"
-    },
     "settings_filter_intro": {
         "message": "\u5982\u679c\u4e0d\u60f3\u4fa7\u8fb9\u680f\u5728\u6bcf\u4e2a\u9875\u9762\u4e0a\u90fd\u52a0\u8f7d\uff0c\u53ef\u4ee5\u901a\u8fc7\u767d\u540d\u5355\uff08\u9ed1\u540d\u5355\uff09\u8bbe\u5b9a\u5728\u54ea\u4e9b\u9875\u9762\uff08\u4e0d\uff09\u52a0\u8f7d\u4fa7\u8fb9\u680f\u3002"
     },
@@ -743,6 +737,12 @@
     "settings_import": {
         "message": "\u5bfc\u5165\u8bbe\u7f6e"
     },
+    "settings_import_saved": {
+        "message": "\u914d\u7f6e\u5bfc\u5165\u6210\u529f"
+    },
+    "settings_import_failed": {
+        "message": "\u914d\u7f6e\u5bfc\u5165\u5931\u8d25\uff0c\u8bf7\u9009\u62e9\u6b63\u786e\u7684\u6587\u4ef6\u3002"
+    },
     "settings_presets": {
         "message": "\u9884\u9009"
     },

diff --git a/src/js/helper/utility.js b/src/js/helper/utility.js
@@ -132,6 +132,7 @@
                 "localhost",
                 "https?://127\.0\.0\.",
                 "127\.0\.0\.",
+                "file://",
                 "chrome://",
                 "chrome\-extension://"
             ].some((str) => {

diff --git a/src/js/newtab/topPages.js b/src/js/newtab/topPages.js
@@ -293,7 +293,7 @@
             let list = [];
 
             allBookmarks.some((bookmark) => {
-                if ((config.showHidden || n.helper.entry.isVisible(bookmark.id)) && n.helper.entry.isSeparator(bookmark.id) === false) {
+                if ((config.showHidden || n.helper.entry.isVisible(bookmark.id)) && n.helper.entry.isSeparator(bookmark.id) === false && bookmark.url.search(/^file:\/\//) !== 0) {
                     list.push(bookmark);
                     if (list.length >= amount.total) {
                         return true;