From 6134289d0aae2a7a60f79d58afc2ca56762f60ca Mon Sep 17 00:00:00 2001
From: jebbs <qjebbs@gmail.com>
Date: Fri, 10 Jan 2020 16:35:57 +0800
Subject: [PATCH] queryUrl expected url

---
 scripts/background/actions.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/background/actions.js b/scripts/background/actions.js
index 7c25b0e..3dcbb5e 100644
--- a/scripts/background/actions.js
+++ b/scripts/background/actions.js
@@ -86,10 +86,10 @@ function redirectTab(tab, url) {
                     action: ACTION_GOTO_URL,
                     url: url
                 }
-                sendMessage(tab, req, `Goto url: ${url}`);
+                return sendMessage(tab, req, `Goto url: ${url}`);
             }
         })
-        .then(() => queryUrl(tab, curUrl, 'Check if tab url matches expected...'))
+        .then(() => queryUrl(tab, url, 'Check if tab url matches expected...'))
 }
 
 /**
@@ -125,14 +125,14 @@ function reportIn(tab) {
 /**
  * get the url of the target tab
  * @param {any} tab target tab
- * @param {string} urlExcluded if specified, queryUrl resolves only when response not equals to urlExcluded
+ * @param {string} expected if specified, queryUrl resolves only when tab url equals to expected
  * @returns {Promise<string>} a promise of the url
  */
-function queryUrl(tab, urlExcluded, log) {
+function queryUrl(tab, expected, log) {
     let req = {
         action: ACTION_QUERY_URL
     }
-    let cond = url => url && (!urlExcluded || (urlExcluded && urlExcluded != url));
+    let cond = url => url && (!expected || (expected && expected == url));
     return sendMessage(tab, req, log, cond);
 }