diff --git a/src/background.js b/src/background.js new file mode 100644 index 0000000..bc7a51c --- /dev/null +++ b/src/background.js @@ -0,0 +1,46 @@ +function completeInitialization() { + // Set the default background color of the action icon badge. + chrome.browserAction.setBadgeBackgroundColor({ + color: "#0071b3" + }); + + /* Toggle the toolbar icon based on whether stickies are, or are not, set to + be killed on the current tab, or update the badge with # of stickies killed. + + This listener receives a message from the content script (contentScript.js); + the content script actually determines what the settings for the current + tab are. + */ + chrome.runtime.onMessage.addListener((request, sender, sendResponse) => { + if (typeof request.killingStickies != "undefined") { + let icons = request.killingStickies ? + AKS.actionIcons.on : + AKS.actionIcons.off; + chrome.browserAction.setIcon({ + path: icons, + tabId: request.tabID || sender.tab.id + }); + } else if (typeof request.newBadgeText != "undefined") { + chrome.browserAction.setBadgeText({ + tabId: sender.tab.id, + text: request.newBadgeText + }); + } + }); +} + +function initialize() { + window.AKS = { }; + + var xhr = new XMLHttpRequest(); + xhr.onload = () => { + AKS.actionIcons = JSON.parse(this.response); + completeInitialization(); + }; + xhr.open('GET', chrome.extension.getURL('/action_icons.json'), true); + xhr.send(); +} + +initialize; + + diff --git a/src/images/ASK_off_48.png b/src/images/AKS_off_48.png similarity index 100% rename from src/images/ASK_off_48.png rename to src/images/AKS_off_48.png diff --git a/src/images/ASK_on_32.png b/src/images/AKS_on_32.png similarity index 100% rename from src/images/ASK_on_32.png rename to src/images/AKS_on_32.png diff --git a/src/images/ASK_on_48.png b/src/images/AKS_on_48.png similarity index 100% rename from src/images/ASK_on_48.png rename to src/images/AKS_on_48.png diff --git a/src/options.html b/src/options.html index 2c5f6d1..db256ab 100644 --- a/src/options.html +++ b/src/options.html @@ -6,7 +6,7 @@ - +

AlwaysKillSticky

diff --git a/src/platform/chrome/action_icons.json b/src/platform/chrome/action_icons.json new file mode 100644 index 0000000..9aa13a6 --- /dev/null +++ b/src/platform/chrome/action_icons.json @@ -0,0 +1,14 @@ +{ + "on": { + "16": "images/AKS_on_16.png", + "32": "images/AKS_on_32.png", + "48": "images/AKS_on_48.png", + "128": "images/AKS_on_128.png" + }, + "off": { + "16": "images/AKS_off_16.png", + "32": "images/AKS_off_32.png", + "48": "images/AKS_off_48.png", + "128": "images/AKS_off_128.png" + } +} diff --git a/src/platform/chrome/background.js b/src/platform/chrome/background.js deleted file mode 100644 index 287e900..0000000 --- a/src/platform/chrome/background.js +++ /dev/null @@ -1,35 +0,0 @@ -/* Toggle the toolbar icon based on whether stickies are, or are not, set to - be killed on the current tab. - - This listener receives a message from the content script (contentScript.js); - the content script actually determines what the settings for the current - tab are. - */ -chrome.runtime.onMessage.addListener((request, sender, sendResponse) => { - if (typeof request.killingStickies != "undefined") { - let icons = request.killingStickies ? { - "16": "images/ASK_on_16.png", - "32": "images/ASK_on_32.png", - "48": "images/ASK_on_48.png", - "128": "images/ASK_on_128.png" - } : { - "16": "images/ASK_off_16.png", - "32": "images/ASK_off_32.png", - "48": "images/ASK_off_48.png", - "128": "images/ASK_off_128.png" - }; - chrome.browserAction.setIcon({ - path: icons, - tabId: request.tabID || sender.tab.id - }); - } else if (typeof request.newBadgeText != "undefined") { - chrome.browserAction.setBadgeText({ - tabId: sender.tab.id, - text: request.newBadgeText - }); - } -}); - -chrome.browserAction.setBadgeBackgroundColor({ - color: "#0071b3" -}); \ No newline at end of file diff --git a/src/platform/chrome/images/ASK_off_128.png b/src/platform/chrome/images/AKS_off_128.png similarity index 100% rename from src/platform/chrome/images/ASK_off_128.png rename to src/platform/chrome/images/AKS_off_128.png diff --git a/src/platform/chrome/images/ASK_off_16.png b/src/platform/chrome/images/AKS_off_16.png similarity index 100% rename from src/platform/chrome/images/ASK_off_16.png rename to src/platform/chrome/images/AKS_off_16.png diff --git a/src/platform/chrome/images/ASK_off_32.png b/src/platform/chrome/images/AKS_off_32.png similarity index 100% rename from src/platform/chrome/images/ASK_off_32.png rename to src/platform/chrome/images/AKS_off_32.png diff --git a/src/platform/chrome/images/ASK_on_128.png b/src/platform/chrome/images/AKS_on_128.png similarity index 100% rename from src/platform/chrome/images/ASK_on_128.png rename to src/platform/chrome/images/AKS_on_128.png diff --git a/src/platform/chrome/images/ASK_on_16.png b/src/platform/chrome/images/AKS_on_16.png similarity index 100% rename from src/platform/chrome/images/ASK_on_16.png rename to src/platform/chrome/images/AKS_on_16.png diff --git a/src/platform/chrome/manifest.json b/src/platform/chrome/manifest.json index 6674083..6d7289e 100644 --- a/src/platform/chrome/manifest.json +++ b/src/platform/chrome/manifest.json @@ -20,17 +20,17 @@ "default_popup": "popup.html", "default_title": "AlwaysKillSticky - Click the icon to control sticky-killing on this site!", "default_icon": { - "16": "images/ASK_on_16.png", - "32": "images/ASK_on_32.png", - "48": "images/ASK_on_48.png", - "128": "images/ASK_on_128.png" + "16": "images/AKS_on_16.png", + "32": "images/AKS_on_32.png", + "48": "images/AKS_on_48.png", + "128": "images/AKS_on_128.png" } }, "icons": { - "16": "images/ASK_on_16.png", - "32": "images/ASK_on_32.png", - "48": "images/ASK_on_48.png", - "128": "images/ASK_on_128.png" + "16": "images/AKS_on_16.png", + "32": "images/AKS_on_32.png", + "48": "images/AKS_on_48.png", + "128": "images/AKS_on_128.png" }, "options_page": "options.html" } \ No newline at end of file diff --git a/src/platform/firefox/action_icons.json b/src/platform/firefox/action_icons.json new file mode 100644 index 0000000..109e99c --- /dev/null +++ b/src/platform/firefox/action_icons.json @@ -0,0 +1,10 @@ +{ + "on": { + "19": "images/AKS_on_19.png", + "38": "images/AKS_on_38.png" + }, + "off": { + "19": "images/AKS_off_19.png", + "38": "images/AKS_off_38.png" + } +} diff --git a/src/platform/firefox/background.js b/src/platform/firefox/background.js deleted file mode 100644 index 5aad454..0000000 --- a/src/platform/firefox/background.js +++ /dev/null @@ -1,31 +0,0 @@ -/* Toggle the toolbar icon based on whether stickies are, or are not, set to - be killed on the current tab. - - This listener receives a message from the content script (contentScript.js); - the content script actually determines what the settings for the current - tab are. - */ -chrome.runtime.onMessage.addListener((request, sender, sendResponse) => { - if (typeof request.killingStickies != "undefined") { - let icons = request.killingStickies ? { - "19": "images/ASK_on_19.png", - "38": "images/ASK_on_38.png", - } : { - "19": "images/ASK_off_19.png", - "38": "images/ASK_off_38.png", - }; - chrome.browserAction.setIcon({ - path: icons, - tabId: request.tabID || sender.tab.id - }); - } else if (typeof request.newBadgeText != "undefined") { - chrome.browserAction.setBadgeText({ - tabId: sender.tab.id, - text: request.newBadgeText - }); - } -}); - -chrome.browserAction.setBadgeBackgroundColor({ - color: "#0071b3" -}); \ No newline at end of file diff --git a/src/platform/firefox/images/ASK_off_19.png b/src/platform/firefox/images/AKS_off_19.png similarity index 100% rename from src/platform/firefox/images/ASK_off_19.png rename to src/platform/firefox/images/AKS_off_19.png diff --git a/src/platform/firefox/images/ASK_off_38.png b/src/platform/firefox/images/AKS_off_38.png similarity index 100% rename from src/platform/firefox/images/ASK_off_38.png rename to src/platform/firefox/images/AKS_off_38.png diff --git a/src/platform/firefox/images/ASK_off_96.png b/src/platform/firefox/images/AKS_off_96.png similarity index 100% rename from src/platform/firefox/images/ASK_off_96.png rename to src/platform/firefox/images/AKS_off_96.png diff --git a/src/platform/firefox/images/ASK_on_19.png b/src/platform/firefox/images/AKS_on_19.png similarity index 100% rename from src/platform/firefox/images/ASK_on_19.png rename to src/platform/firefox/images/AKS_on_19.png diff --git a/src/platform/firefox/images/ASK_on_38.png b/src/platform/firefox/images/AKS_on_38.png similarity index 100% rename from src/platform/firefox/images/ASK_on_38.png rename to src/platform/firefox/images/AKS_on_38.png diff --git a/src/platform/firefox/images/ASK_on_96.png b/src/platform/firefox/images/AKS_on_96.png similarity index 100% rename from src/platform/firefox/images/ASK_on_96.png rename to src/platform/firefox/images/AKS_on_96.png diff --git a/src/platform/firefox/manifest.json b/src/platform/firefox/manifest.json index bcc175f..e671371 100644 --- a/src/platform/firefox/manifest.json +++ b/src/platform/firefox/manifest.json @@ -25,13 +25,13 @@ "default_popup": "popup.html", "default_title": "AlwaysKillSticky - Click the icon to control sticky-killing on this site!", "default_icon": { - "19": "images/ASK_on_19.png", - "38": "images/ASK_on_38.png" + "19": "images/AKS_on_19.png", + "38": "images/AKS_on_38.png" } }, "icons": { - "48": "images/ASK_on_48.png", - "96": "images/ASK_on_96.png" + "48": "images/AKS_on_48.png", + "96": "images/AKS_on_96.png" }, "options_ui": { "page": "options.html",