fixes #24

andy-portmen · Oct 18, 2017 · a879ac6 · a879ac6
1 parent 224bc78
commit a879ac6
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 37 deletions.
diff --git a/Misc/translation/ro/webstore.txt b/Misc/translation/ro/webstore.txt
diff --git a/WebExtension/_locales/de/messages.json b/WebExtension/_locales/de/messages.json
@@ -129,8 +129,8 @@
         "message": "Benutzerdefinierte URL"
     },
     "optionsSaveButton": {
-+        "message": "Speichern"
-+    },
+        "message": "Speichern"
+    },
     "optionsMSG": {
         "message": "Einstellungen gespeichert."
     },
@@ -758,7 +758,7 @@
     "country_SD": {
         "message": "Sudan"
     },
-    "country_SR": {         
+    "country_SR": {
         "message": "Suriname"
     },
     "country_SJ": {

diff --git a/WebExtension/common.js b/WebExtension/common.js
@@ -124,7 +124,7 @@ function resolve(tabId) {
   }
 }
 
-chrome.webRequest.onResponseStarted.addListener(({ip, tabId, url}) => {
+var onResponseStarted = ({ip, tabId, url}) => {
   if (!ip) {
     return;
   }
@@ -170,7 +170,8 @@ chrome.webRequest.onResponseStarted.addListener(({ip, tabId, url}) => {
   else {
     set({ip}, false, true);
   }
-}, {
+};
+chrome.webRequest.onResponseStarted.addListener(onResponseStarted, {
   urls: ['<all_urls>'],
   types: ['main_frame']
 }, []);

diff --git a/WebExtension/existing.js b/WebExtension/existing.js
@@ -0,0 +1,30 @@
+/* globals onResponseStarted */
+'use strict';
+
+document.addEventListener('DOMContentLoaded', () => chrome.tabs.query({
+  url: '*://*/*'
+}, tabs => {
+  if (tabs.length) {
+    const cache = tabs.reduce((p, c) => {
+      p[c.url] = c.id;
+      return p;
+    }, {});
+
+    const init = d => cache[d.url] && onResponseStarted({
+      ip: d.ip,
+      tabId: cache[d.url],
+      url: d.url
+    });
+
+    chrome.webRequest.onResponseStarted.addListener(init, {
+      urls: ['*://*/*'],
+      types: ['xmlhttprequest']
+    }, []);
+
+    Promise.all(
+      tabs.map(t => fetch(t.url).then(r => r.headers.get('content-type')).catch(() => {}))
+    ).then(() => {
+      chrome.webRequest.onResponseStarted.removeListener(init);
+    });
+  }
+}));
diff --git a/WebExtension/manifest.json b/WebExtension/manifest.json
@@ -3,7 +3,7 @@
   "short_name": "icflags",
   "description": "__MSG_appDesc__",
   "author": "Andy Portmen",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "default_locale": "en",
   "manifest_version": 2,
   "permissions": [
@@ -28,7 +28,8 @@
   "background": {
     "scripts": [
       "utils.js",
-      "common.js"
+      "common.js",
+      "existing.js"
     ]
   },
   "page_action": {},