From 149a22a2c197a8d4d8b9ba8c951a08183a11ba63 Mon Sep 17 00:00:00 2001 From: Diego Mantellassi Date: Mon, 16 Sep 2019 12:19:21 +0200 Subject: [PATCH 1/2] Fixed issue #67 on right click purge action --- js/background.js | 41 ++++++++++++----------------------------- 1 file changed, 12 insertions(+), 29 deletions(-) diff --git a/js/background.js b/js/background.js index 24de06e..60261c5 100644 --- a/js/background.js +++ b/js/background.js @@ -39,7 +39,6 @@ var showBasicNotification = function(title, message, img = img_info) { }); } - //open popup.html as a separate window every time a user clicks on the ext icon chrome.browserAction.onClicked.addListener(function(tab) { chrome.windows.create({ @@ -206,7 +205,8 @@ chrome.contextMenus.create({ chrome.contextMenus.onClicked.addListener(function(event){ var network = "staging"; - if (event.srcUrl != null) { + var currentUrl = event.frameUrl || event.pageUrl; + if (currentUrl != null) { switch (event.menuItemId) { case "akamaidevtoolkitchild1": network = "staging"; @@ -222,13 +222,15 @@ chrome.contextMenus.onClicked.addListener(function(event){ alert("URL does not exist"); return false; } - chrome.tabs.query({active: true, currentWindow: true}, function(tabs) { - chrome.tabs.executeScript(tabs[0].id, {file: "js/jquery-3.1.1.min.js"}, function() { - chrome.tabs.executeScript(tabs[0].id, {file: "js/HoldOn.min.js"}, function() { - chrome.tabs.executeScript(tabs[0].id, {file: "js/modal.js"}, function() { - chrome.tabs.sendMessage(tabs[0].id, {action: "open"}, function(response) { - makePurgeRequest([event.srcUrl], network, function(){ - chrome.tabs.sendMessage(tabs[0].id, {action: "close"}); + + chrome.tabs.query({active: true, lastFocusedWindow: true}, function(tabs) { + var tab = tabs[0]; + chrome.tabs.executeScript(tab.id, {file: "js/jquery-3.1.1.min.js"}, function() { + chrome.tabs.executeScript(tab.id, {file: "js/HoldOn.min.js"}, function() { + chrome.tabs.executeScript(tab.id, {file: "js/modal.js"}, function() { + chrome.tabs.sendMessage(tab.id, {action: "open"}, function(response) { + makePurgeRequest([currentUrl], network, function(){ + chrome.tabs.sendMessage(tab.id, {action: "close"}); }); }); }); @@ -346,23 +348,4 @@ var initStorageTemp = function() { }); } }); -} - - - - - - - - - - - - - - - - - - - +} \ No newline at end of file From f56fd3335d16caf3087caf4f8bf214e99f186b9e Mon Sep 17 00:00:00 2001 From: Diego Mantellassi Date: Tue, 24 Sep 2019 15:02:10 +0200 Subject: [PATCH 2/2] added check on tabs --- js/background.js | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/js/background.js b/js/background.js index 60261c5..80548e5 100644 --- a/js/background.js +++ b/js/background.js @@ -223,19 +223,21 @@ chrome.contextMenus.onClicked.addListener(function(event){ return false; } - chrome.tabs.query({active: true, lastFocusedWindow: true}, function(tabs) { - var tab = tabs[0]; - chrome.tabs.executeScript(tab.id, {file: "js/jquery-3.1.1.min.js"}, function() { - chrome.tabs.executeScript(tab.id, {file: "js/HoldOn.min.js"}, function() { - chrome.tabs.executeScript(tab.id, {file: "js/modal.js"}, function() { - chrome.tabs.sendMessage(tab.id, {action: "open"}, function(response) { - makePurgeRequest([currentUrl], network, function(){ - chrome.tabs.sendMessage(tab.id, {action: "close"}); + chrome.tabs.query({active: true, currentWindow: true}, function(tabs) { + if (tabs.length) { + var tab = tabs[0]; + chrome.tabs.executeScript(tab.id, {file: "js/jquery-3.1.1.min.js"}, function() { + chrome.tabs.executeScript(tab.id, {file: "js/HoldOn.min.js"}, function() { + chrome.tabs.executeScript(tab.id, {file: "js/modal.js"}, function() { + chrome.tabs.sendMessage(tab.id, {action: "open"}, function(response) { + makePurgeRequest([currentUrl], network, function(){ + chrome.tabs.sendMessage(tab.id, {action: "close"}); + }); }); }); }); }); - }); + } }); });