diff --git a/chromium/background.js b/chromium/background.js index 421d6ddf0379..1a8a05bc47a9 100644 --- a/chromium/background.js +++ b/chromium/background.js @@ -38,26 +38,33 @@ var switchPlannerInfo = {}; // Is HTTPSe enabled, or has it been manually disabled by the user? var isExtensionEnabled = true; -// The setBadgeText API has an abandoned bug: https://crbug.com/170413 -chrome.browserAction.setBadgeText({ text: "" }); // Load prefs about whether http nowhere is on. Structure is: // { httpNowhere: true/false } var httpNowhereOn = false; chrome.storage.sync.get({httpNowhere: false}, function(item) { httpNowhereOn = item.httpNowhere; - setIconColor(); + updateState(); }); chrome.storage.onChanged.addListener(function(changes, areaName) { if (areaName === 'sync') { for (var key in changes) { if (key === 'httpNowhere') { httpNowhereOn = changes[key].newValue; - setIconColor(); + updateState(); } } } }); +chrome.tabs.onActivated.addListener(function() { + updateState(); +}); +chrome.windows.onFocusChanged.addListener(function() { + updateState(); +}); +chrome.webNavigation.onCompleted.addListener(function() { + updateState(); +}); /** * Load stored user rules @@ -88,26 +95,35 @@ loadStoredUserRules(); /** * Set the icon color correctly - * Depending on http-nowhere it should be red/default + * inactive: extension is enabled, but no rules were triggered on this page. + * blocking: extension is in "block all HTTP requests" mode. + * active: extension is enabled and rewrote URLs on this page. + * disabled: extension is disabled from the popup menu. */ -var setIconColor = function() { - var newIconPath = httpNowhereOn ? './icon38-red.png' : './icon38.png'; - chrome.browserAction.setIcon({ - path: newIconPath +var updateState = function() { + chrome.tabs.query({active: true, currentWindow: true}, function(tabs) { + if (!tabs || tabs.length === 0) { + return; + } + var applied = activeRulesets.getRulesets(tabs[0].id) + var iconState = "inactive"; + if (!isExtensionEnabled) { + iconState = "disabled"; + } else if (httpNowhereOn) { + iconState = "blocking"; + } else if (applied) { + iconState = "active"; + } + chrome.browserAction.setIcon({ + path: { + "38": "icons/icon-" + iconState + "-38.png" + } + }); + chrome.browserAction.setTitle({ + title: "HTTPS Everywhere (" + iconState + ")" + }); }); -}; - -/* -for (var v in localStorage) { - log(DBUG, "localStorage["+v+"]: "+localStorage[v]); -} - -var rs = all_rules.potentiallyApplicableRulesets("www.google.com"); -for (r in rs) { - log(DBUG, rs[r].name +": "+ rs[r].active); - log(DBUG, rs[r].name +": "+ rs[r].default_state); } -*/ /** * Adds a new user rule diff --git a/chromium/devtools.js b/chromium/devtools.js index 51fd7c7278c5..343bee094295 100644 --- a/chromium/devtools.js +++ b/chromium/devtools.js @@ -1,5 +1,5 @@ chrome.devtools.panels.create("HTTPS Everywhere", - "icon48.png", + "icons/icon-active-38.png", "devtools-panel.html", function(panel) { } diff --git a/chromium/icons/icon-active-128.png b/chromium/icons/icon-active-128.png new file mode 120000 index 000000000000..bfc9f4b018ee --- /dev/null +++ b/chromium/icons/icon-active-128.png @@ -0,0 +1 @@ +../../common/icons/icon-active-128.png \ No newline at end of file diff --git a/chromium/icons/icon-active-38.png b/chromium/icons/icon-active-38.png new file mode 120000 index 000000000000..49c692e81d54 --- /dev/null +++ b/chromium/icons/icon-active-38.png @@ -0,0 +1 @@ +../../common/icons/icon-active-38.png \ No newline at end of file diff --git a/chromium/icons/icon-active-48.png b/chromium/icons/icon-active-48.png new file mode 120000 index 000000000000..90a5ddd5dce2 --- /dev/null +++ b/chromium/icons/icon-active-48.png @@ -0,0 +1 @@ +../../common/icons/icon-active-48.png \ No newline at end of file diff --git a/chromium/icons/icon-blocking-38.png b/chromium/icons/icon-blocking-38.png new file mode 120000 index 000000000000..93790eaeeca3 --- /dev/null +++ b/chromium/icons/icon-blocking-38.png @@ -0,0 +1 @@ +../../common/icons/icon-blocking-38.png \ No newline at end of file diff --git a/chromium/icons/icon-disabled-38.png b/chromium/icons/icon-disabled-38.png new file mode 120000 index 000000000000..93d63819569b --- /dev/null +++ b/chromium/icons/icon-disabled-38.png @@ -0,0 +1 @@ +../../common/icons/icon-disabled-38.png \ No newline at end of file diff --git a/chromium/icons/icon-inactive-38.png b/chromium/icons/icon-inactive-38.png new file mode 120000 index 000000000000..3ba46568224b --- /dev/null +++ b/chromium/icons/icon-inactive-38.png @@ -0,0 +1 @@ +../../common/icons/icon-inactive-38.png \ No newline at end of file diff --git a/chromium/manifest.json b/chromium/manifest.json index c93568bf4c20..70c9368f1a0a 100644 --- a/chromium/manifest.json +++ b/chromium/manifest.json @@ -1,7 +1,7 @@ { "author": { "email": "eff.software.projects@gmail.com" - }, + }, "background": { "scripts": [ "rules.js", @@ -9,35 +9,35 @@ "background.js", "incognito-cache-clearing.js" ] - }, + }, "browser_action": { "default_icon": { - "38": "icon38.png" - }, - "default_popup": "popup.html", + "38": "icons/icon-active-38.png" + }, + "default_popup": "popup.html", "default_title": "__MSG_about_ext_name__" - }, - "default_locale": "en", - "description": "__MSG_about_ext_description__", - "devtools_page": "devtools.html", - "homepage_url": "https://www.eff.org/https-everywhere", + }, + "default_locale": "en", + "description": "__MSG_about_ext_description__", + "devtools_page": "devtools.html", + "homepage_url": "https://www.eff.org/https-everywhere", "icons": { - "128": "icon128.png", - "16": "icon16.png", - "48": "icon48.png" - }, + "48": "icons/icon-active-48.png", + "128": "icons/icon-active-128.png" + }, "incognito": "spanning", - "manifest_version": 2, + "manifest_version": 2, "minimum_chrome_version": "45", - "name": "__MSG_about_ext_name__", + "name": "__MSG_about_ext_name__", "permissions": [ - "webRequest", - "webRequestBlocking", - "tabs", - "cookies", - "storage", + "webNavigation", + "webRequest", + "webRequestBlocking", + "tabs", + "cookies", + "storage", "" - ], - "update_url": "https://www.eff.org/files/https-everywhere-chrome-updates.xml", + ], + "update_url": "https://www.eff.org/files/https-everywhere-chrome-updates.xml", "version": "2015.12.16" -} \ No newline at end of file +} diff --git a/chromium/popup.js b/chromium/popup.js index e315e24339fe..f230813b992c 100644 --- a/chromium/popup.js +++ b/chromium/popup.js @@ -86,6 +86,7 @@ function updateEnabledDisabledUI() { } else { document.body.className = "disabled" } + backgroundPage.updateState(); } // Toggle extension enabled/disabled status @@ -93,15 +94,14 @@ function toggleEnabledDisabled() { if (backgroundPage.isExtensionEnabled) { // User wants to disable us backgroundPage.isExtensionEnabled = false; - chrome.browserAction.setBadgeText({ text: "OFF" }); } else { // User wants to enable us backgroundPage.isExtensionEnabled = true; - chrome.browserAction.setBadgeText({ text: "" }); } updateEnabledDisabledUI(); // The extension state changed, so reload this tab. chrome.tabs.reload(); + window.close(); } /** diff --git a/common/https-everywhere-banner.png b/common/https-everywhere-banner.png new file mode 100644 index 000000000000..b3fbaaab7659 Binary files /dev/null and b/common/https-everywhere-banner.png differ diff --git a/common/icons/icon-active-128.png b/common/icons/icon-active-128.png new file mode 100644 index 000000000000..0e80d104a41b Binary files /dev/null and b/common/icons/icon-active-128.png differ diff --git a/common/icons/icon-active-16.png b/common/icons/icon-active-16.png new file mode 100644 index 000000000000..a17e871caf71 Binary files /dev/null and b/common/icons/icon-active-16.png differ diff --git a/common/icons/icon-active-24.png b/common/icons/icon-active-24.png new file mode 100644 index 000000000000..eec32551744c Binary files /dev/null and b/common/icons/icon-active-24.png differ diff --git a/common/icons/icon-active-38.png b/common/icons/icon-active-38.png new file mode 100644 index 000000000000..000888667d64 Binary files /dev/null and b/common/icons/icon-active-38.png differ diff --git a/common/icons/icon-active-48.png b/common/icons/icon-active-48.png new file mode 100644 index 000000000000..3d3cb7950a12 Binary files /dev/null and b/common/icons/icon-active-48.png differ diff --git a/common/icons/icon-blocking-128.png b/common/icons/icon-blocking-128.png new file mode 100644 index 000000000000..3990e56d81c7 Binary files /dev/null and b/common/icons/icon-blocking-128.png differ diff --git a/common/icons/icon-blocking-16.png b/common/icons/icon-blocking-16.png new file mode 100644 index 000000000000..83c7848c68bd Binary files /dev/null and b/common/icons/icon-blocking-16.png differ diff --git a/common/icons/icon-blocking-24.png b/common/icons/icon-blocking-24.png new file mode 100644 index 000000000000..d6fe5cf4277e Binary files /dev/null and b/common/icons/icon-blocking-24.png differ diff --git a/common/icons/icon-blocking-38.png b/common/icons/icon-blocking-38.png new file mode 100644 index 000000000000..20ed86bd0366 Binary files /dev/null and b/common/icons/icon-blocking-38.png differ diff --git a/common/icons/icon-blocking-48.png b/common/icons/icon-blocking-48.png new file mode 100644 index 000000000000..a6ae9938da20 Binary files /dev/null and b/common/icons/icon-blocking-48.png differ diff --git a/common/icons/icon-disabled-128.png b/common/icons/icon-disabled-128.png new file mode 100644 index 000000000000..da5626dde149 Binary files /dev/null and b/common/icons/icon-disabled-128.png differ diff --git a/common/icons/icon-disabled-16.png b/common/icons/icon-disabled-16.png new file mode 100644 index 000000000000..1e9d56b4e92e Binary files /dev/null and b/common/icons/icon-disabled-16.png differ diff --git a/common/icons/icon-disabled-24.png b/common/icons/icon-disabled-24.png new file mode 100644 index 000000000000..70c4ca28979a Binary files /dev/null and b/common/icons/icon-disabled-24.png differ diff --git a/common/icons/icon-disabled-38.png b/common/icons/icon-disabled-38.png new file mode 100644 index 000000000000..9cfb006842d1 Binary files /dev/null and b/common/icons/icon-disabled-38.png differ diff --git a/common/icons/icon-disabled-48.png b/common/icons/icon-disabled-48.png new file mode 100644 index 000000000000..59838b81f2b4 Binary files /dev/null and b/common/icons/icon-disabled-48.png differ diff --git a/common/icons/icon-inactive-128.png b/common/icons/icon-inactive-128.png new file mode 100644 index 000000000000..ca108d30b6a4 Binary files /dev/null and b/common/icons/icon-inactive-128.png differ diff --git a/common/icons/icon-inactive-16.png b/common/icons/icon-inactive-16.png new file mode 100644 index 000000000000..0bdf33831dda Binary files /dev/null and b/common/icons/icon-inactive-16.png differ diff --git a/common/icons/icon-inactive-24.png b/common/icons/icon-inactive-24.png new file mode 100644 index 000000000000..28d087da92ad Binary files /dev/null and b/common/icons/icon-inactive-24.png differ diff --git a/common/icons/icon-inactive-38.png b/common/icons/icon-inactive-38.png new file mode 100644 index 000000000000..29fa6050c97c Binary files /dev/null and b/common/icons/icon-inactive-38.png differ diff --git a/common/icons/icon-inactive-48.png b/common/icons/icon-inactive-48.png new file mode 100644 index 000000000000..fb6d75eb8593 Binary files /dev/null and b/common/icons/icon-inactive-48.png differ diff --git a/makecrx.sh b/makecrx.sh index c2c7246c1dd2..487efff6b029 100755 --- a/makecrx.sh +++ b/makecrx.sh @@ -56,7 +56,7 @@ sed -e "s/VERSION/$VERSION/g" chromium/updates-master.xml > chromium/updates.xml mkdir -p pkg/crx/rules cd pkg/crx -cp -a ../../chromium/* . +rsync -aL ../../chromium/ ./ # Turn the Firefox translations into the appropriate Chrome format: rm -rf _locales/ mkdir _locales/ diff --git a/makexpi.sh b/makexpi.sh index 038c74d5d9ed..8f67d2942644 100755 --- a/makexpi.sh +++ b/makexpi.sh @@ -101,7 +101,7 @@ fi # Prepare packages suitable for uploading to EFF and AMO, respectively. [ -d pkg ] || mkdir pkg -rsync -a --delete --delete-excluded --exclude /chrome/content/rules src/ pkg/xpi-eff +rsync -aL --delete --delete-excluded --exclude /chrome/content/rules src/ pkg/xpi-eff cp -a translations/* pkg/xpi-eff/chrome/locale/ rsync -a --delete pkg/xpi-eff/ pkg/xpi-amo # The AMO version of the package cannot contain the updateKey or updateURL tags. diff --git a/src/chrome/content/observatory-popup.xul b/src/chrome/content/observatory-popup.xul index 60da68fdc620..14a373010b68 100644 --- a/src/chrome/content/observatory-popup.xul +++ b/src/chrome/content/observatory-popup.xul @@ -11,7 +11,7 @@ onload="document.getElementById('ask-me-later').focus()" >