Stop closing every tab

muan · muan · commit 086aa9272ec7 · 2017-02-09T15:56:16.000+08:00
diff --git a/chrome/src/bg/background.js b/chrome/src/bg/background.js
@@ -9,28 +9,31 @@ request.onload = function() {
     if(localStorage[key]) { data[key] = localStorage[key] }
   }
 
-  chrome.extension.onMessage.addListener(
-    function(request, sender, sendMessage) {
-      if(request.url) {
-        chrome.tabs.query(
-          {windowId: sender.tab.windowId},
-          function(tabs) {
-            var position = sender.tab.index;
-            for(var i = position; i < tabs.length; i++) {
-              if(tabs[i].openerTabId == sender.tab.id) {
-                position = i
-              }
+  chrome.extension.onMessage.addListener(function(req, sender, sendMessage) {
+    if(req.url) {
+      chrome.tabs.query(
+        {windowId: sender.tab.windowId},
+        function(tabs) {
+          var position = sender.tab.index;
+          for(var i = position; i < tabs.length; i++) {
+            if(tabs[i].openerTabId == sender.tab.id) {
+              position = i
             }
-            request.openerTabId = sender.tab.id
-            request.index = position + 1
-            chrome.tabs.create(request, function(tab) { listenAndCloseTab(tab, request.url, sender.tab.id) })
           }
-        )
-      } else {
-        sendMessage(data)
-      }
+          var mute = req.mute
+          delete req.mute
+
+          req.openerTabId = sender.tab.id
+          req.index = position + 1
+          chrome.tabs.create(req, function(tab) {
+            if (mute) listenAndCloseTab(tab, req.url, sender.tab.id)
+          })
+        }
+      )
+    } else {
+      sendMessage(data)
     }
-  )
+  })
 }
 
 function listenAndCloseTab (tab, url, originalTabId) {
diff --git a/chrome/src/inject/inject.js b/chrome/src/inject/inject.js
@@ -65,7 +65,7 @@ function initOnHashChangeAction(domains) {
 
             muteLink.addEventListener('click', function (evt) {
               evt.preventDefault()
-              chrome.extension.sendMessage({url: muteURL, active: false})
+              chrome.extension.sendMessage({url: muteURL, active: false, mute: true})
               muteLink.innerHTML = '&ctdot;'
             })
           }

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ function initOnHashChangeAction(domains) {`
`65`	`65`
`66`	`66`	`muteLink.addEventListener('click', function (evt) {`
`67`	`67`	`evt.preventDefault()`
`68`		`- chrome.extension.sendMessage({url: muteURL, active: false})`
	`68`	`+ chrome.extension.sendMessage({url: muteURL, active: false, mute: true})`
`69`	`69`	`muteLink.innerHTML = '&ctdot;'`
`70`	`70`	`})`
`71`	`71`	`}`