Merge pull request leggett#117 from ndobryanskyy/page-action-icons-fix

leggett#43 - fix icons scaling
vishalsiddula · Apr 29, 2019 · eec0f91 · eec0f91
2 parents 7849961 + c8ac6d2
commit eec0f91
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/gmail/manifest.json b/gmail/manifest.json
@@ -10,15 +10,7 @@
 		"48": "img/icon48.png",
 		"128": "img/icon128.png"
 	},
-	"page_action": {
-		"default_icon": {
-			"16": "img/icon16.png",
-			"24": "img/icon24.png",
-			"32": "img/icon32.png",
-			"48": "img/icon48.png",
-			"128": "img/icon128.png"
-		}
-	},
+	"page_action": {},
 	"content_scripts": [{
       	"matches": ["*://mail.google.com/mail/*"],
       	"js": ["script.js"],

diff --git a/gmail/pageActionHandler.js b/gmail/pageActionHandler.js
@@ -1,34 +1,47 @@
 const toggleOnTitle = 'Enable Simplify';
 const toggleOffTitle = 'Temporarily disable Simplify';
 
-function updateTitle(tabId, toggled) {
+const toggledOnIcon = {
+    16: "img/icon16.png",
+    24: "img/icon24.png",
+    32: "img/icon32.png",
+    48: "img/icon48.png",
+    128: "img/icon128.png"
+}
+
+const toggledOffIcon = {
+    16: "img/icon16_off.png",
+    24: "img/icon24_off.png",
+    32: "img/icon32_off.png",
+    48: "img/icon48_off.png",
+    128: "img/icon128_off.png"
+}
+
+function updatePageAction(tabId, toggled) {
     chrome.pageAction.setTitle({
         tabId: tabId,
         title: toggled ? toggleOffTitle : toggleOnTitle
     });
-}
 
-function updateIcon(tabId, toggled) {
     chrome.pageAction.setIcon({
         tabId: tabId,
-        path: toggled ? 'img/icon128.png' : 'img/icon128_off.png'
+        path: toggled ? toggledOnIcon : toggledOffIcon
     });
 }
 
 chrome.runtime.onMessage.addListener(function (message, sender, sendResponse) {
     if (message.action === 'activate_page_action') {
         const tabId = sender.tab.id;
 
-        updateTitle(tabId, true);
+        updatePageAction(tabId, true);
         chrome.pageAction.show(tabId);
     }
 });
 
 chrome.pageAction.onClicked.addListener(function (tab) {
     const tabId = tab.id;
 
-	chrome.tabs.sendMessage(tabId, {action: 'toggle_simpl'}, function(response) {
-        updateTitle(tabId, response.toggled);
-        updateIcon(tabId, response.toggled);
+    chrome.tabs.sendMessage(tabId, {action: 'toggle_simpl'}, function(response) {
+        updatePageAction(tabId, response.toggled);
     });
 });