From ac498b28fb6047ceb91fb19b7cdf8fca54c1a7a4 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Sun, 20 Nov 2016 04:18:13 +0100 Subject: better presence detection --- src/wxBackend.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/wxBackend.ts b/src/wxBackend.ts index 0418a024f..0fd07ab58 100644 --- a/src/wxBackend.ts +++ b/src/wxBackend.ts @@ -454,7 +454,7 @@ export function wxMain() { chrome.tabs.executeScript(tab.id, { file: "/src/taler-wallet-lib.js" }); chrome.tabs.executeScript(tab.id, { file: "/src/content_scripts/notify.js" }); let code = ` - if (document.documentElement.getAttribute("data-taler-nojs")) { + if (("taler" in window) || document.documentElement.getAttribute("data-taler-nojs")) { document.dispatchEvent(new Event("taler-probe-result")); } `; @@ -476,14 +476,20 @@ export function wxMain() { return; } let code = ` - if (document.documentElement.getAttribute("data-taler-nojs")) { + if (("taler" in window) || document.documentElement.getAttribute("data-taler-nojs")) { document.dispatchEvent(new Event("taler-probe-result")); } `; let run = () => { - chrome.tabs.executeScript(tab.id!, { code, runAt: "document_idle" }); + chrome.tabs.executeScript(tab.id!, { code, runAt: "document_start" }); }; + run(); + chrome.extension.getBackgroundPage().setTimeout(run, 50); chrome.extension.getBackgroundPage().setTimeout(run, 300); + chrome.extension.getBackgroundPage().setTimeout(run, 2000); + chrome.extension.getBackgroundPage().setTimeout(run, 4000); + chrome.extension.getBackgroundPage().setTimeout(run, 8000); + chrome.extension.getBackgroundPage().setTimeout(run, 16000); }); }); -- cgit v1.2.3