diff --git a/chromium/background.js b/chromium/background.js index 408389fb02d0..a7cdbba109bf 100644 --- a/chromium/background.js +++ b/chromium/background.js @@ -61,12 +61,16 @@ chrome.storage.onChanged.addListener(function(changes, areaName) { } } }); -chrome.tabs.onActivated.addListener(function() { - updateState(); -}); -chrome.windows.onFocusChanged.addListener(function() { - updateState(); -}); +if (chrome.tabs) { + chrome.tabs.onActivated.addListener(function() { + updateState(); + }); +} +if (chrome.windows) { + chrome.windows.onFocusChanged.addListener(function() { + updateState(); + }); +} chrome.webNavigation.onCompleted.addListener(function() { updateState(); }); @@ -106,6 +110,9 @@ loadStoredUserRules(); * disabled: extension is disabled from the popup menu. */ var updateState = function() { + if (!chrome.tabs) { + return; + } chrome.tabs.query({active: true, currentWindow: true}, function(tabs) { if (!tabs || tabs.length === 0) { return; @@ -176,9 +183,11 @@ function AppliedRulesets() { this.active_tab_rules = {}; var that = this; - chrome.tabs.onRemoved.addListener(function(tabId, info) { - that.removeTab(tabId); - }); + if (chrome.tabs) { + chrome.tabs.onRemoved.addListener(function(tabId, info) { + that.removeTab(tabId); + }); + } } AppliedRulesets.prototype = { @@ -618,3 +627,38 @@ chrome.runtime.onConnect.addListener(function (port) { }); } }); + +// This is necessary for communication with the popup in Firefox Private +// Browsing Mode, see https://bugzilla.mozilla.org/show_bug.cgi?id=1329304 +chrome.runtime.onMessage.addListener(function(message, sender, sendResponse){ + if (message.type == "get_option") { + storage.get(message.object, function(item){ + sendResponse(item); + }); + return true; + } else if (message.type == "set_option") { + storage.set(message.object); + } else if (message.type == "get_is_extension_enabled") { + sendResponse(isExtensionEnabled); + } else if (message.type == "set_is_extension_enabled") { + isExtensionEnabled = message.object; + sendResponse(isExtensionEnabled); + } else if (message.type == "delete_from_ruleset_cache") { + all_rules.ruleCache.delete(message.object); + } else if (message.type == "get_active_rulesets") { + sendResponse(activeRulesets.getRulesets(message.object)); + } else if (message.type == "set_ruleset_active_status") { + var ruleset = activeRulesets.getRulesets(message.object.tab_id)[message.object.name]; + ruleset.active = message.object.active; + sendResponse(true); + } else if (message.type == "add_new_rule") { + addNewRule(message.object, function() { + sendResponse(true); + }); + return true; + } else if (message.type == "update_state") { + updateState(); + } else if (message.type == "remove_rule") { + removeRule(message.object); + } +}); diff --git a/chromium/incognito-cache-clearing.js b/chromium/incognito-cache-clearing.js index b650253c317a..c0125a2bb5cf 100644 --- a/chromium/incognito-cache-clearing.js +++ b/chromium/incognito-cache-clearing.js @@ -55,7 +55,11 @@ function detect_incognito_destruction(windowId) { // Listen to window creation, so we can detect if an incognito window is created -chrome.windows.onCreated.addListener(detect_incognito_creation); +if (chrome.windows) { + chrome.windows.onCreated.addListener(detect_incognito_creation); +} // Listen to window destruction, so we can clear caches if all incognito windows are destroyed -chrome.windows.onRemoved.addListener(detect_incognito_destruction); +if (chrome.windows) { + chrome.windows.onRemoved.addListener(detect_incognito_destruction); +} diff --git a/chromium/manifest.json b/chromium/manifest.json index a3d91a79311c..35bd1f555e50 100644 --- a/chromium/manifest.json +++ b/chromium/manifest.json @@ -1,7 +1,11 @@ { - "author": { - "email": "eff.software.projects@gmail.com" - }, + "applications": { + "gecko": { + "id": "https-everywhere-eff@eff.org", + "update_url": "https://www.eff.org/files/https-everywhere-updates.json" + } + }, + "author": "eff.software.projects@gmail.com", "background": { "scripts": [ "rules.js", diff --git a/chromium/popup.css b/chromium/popup.css index a817a04648d3..82c3dbb35b7e 100644 --- a/chromium/popup.css +++ b/chromium/popup.css @@ -69,6 +69,7 @@ section.rules { /* Override display attribute of text labels in widgets.css. */ .rule span { display: inline !important; + margin-left: 0.6em; } body { diff --git a/chromium/popup.js b/chromium/popup.js index 6289e8fb06ba..645728e51624 100644 --- a/chromium/popup.js +++ b/chromium/popup.js @@ -1,10 +1,8 @@ "use strict"; -var backgroundPage = chrome.extension.getBackgroundPage(); var stableRules = null; var unstableRules = null; var hostReg = /.*\/\/[^$/]*\//; -var storage = backgroundPage.storage; function e(id) { return document.getElementById(id); @@ -15,18 +13,27 @@ function e(id) { * @param checkbox checkbox being clicked * @param ruleset the ruleset tied tot he checkbox */ -function toggleRuleLine(checkbox, ruleset) { - ruleset.active = checkbox.checked; - - if (ruleset.active != ruleset.default_state) { - localStorage[ruleset.name] = ruleset.active; - } else { - delete localStorage[ruleset.name]; - // purge the name from the cache so that this unchecking is persistent. - backgroundPage.all_rules.ruleCache.delete(ruleset.name); - } - // Now reload the selected tab of the current window. - chrome.tabs.reload(); +function toggleRuleLine(checkbox, ruleset, tab_id) { + var ruleset_active = checkbox.checked; + var set_ruleset = { + active: ruleset_active, + name: ruleset.name, + tab_id: tab_id + }; + + sendMessage("set_ruleset_active_status", set_ruleset, function(){ + + if (ruleset_active != ruleset.default_state) { + localStorage[ruleset.name] = ruleset_active; + } else { + delete localStorage[ruleset.name]; + // purge the name from the cache so that this unchecking is persistent. + sendMessage("delete_from_ruleset_cache", ruleset.name); + } + + // Now reload the selected tab of the current window. + chrome.tabs.reload(); + }); } /** @@ -50,7 +57,7 @@ function appendRuleLineToListDiv(ruleset, list_div) { checkbox.setAttribute("checked", ""); } checkbox.onchange = function(ev) { - toggleRuleLine(checkbox, ruleset); + toggleRuleLine(checkbox, ruleset, tab_id); }; label.appendChild(checkbox); @@ -65,11 +72,14 @@ function appendRuleLineToListDiv(ruleset, list_div) { break; } } - var xhr = new XMLHttpRequest(); - try { - xhr.open("GET", favicon.src, true); - label.appendChild(favicon); - } catch (e) {} + + if (navigator.userAgent.match("Chrome")) { + var xhr = new XMLHttpRequest(); + try { + xhr.open("GET", favicon.src, true); + label.appendChild(favicon); + } catch (e) {} + } // label text var text = document.createElement("span"); @@ -85,7 +95,7 @@ function appendRuleLineToListDiv(ruleset, list_div) { line.appendChild(remove); remove.addEventListener("click", function(){ - backgroundPage.removeRule(ruleset); + sendMessage("remove_rule", ruleset); list_div.removeChild(line); }); } @@ -99,29 +109,36 @@ function appendRuleLineToListDiv(ruleset, list_div) { // Change the UI to reflect extension enabled/disabled function updateEnabledDisabledUI() { - document.getElementById('onoffswitch').checked = backgroundPage.isExtensionEnabled; - // Hide or show the rules sections - if (backgroundPage.isExtensionEnabled) { - document.body.className = "" - } else { - document.body.className = "disabled" - } - backgroundPage.updateState(); + sendMessage("get_is_extension_enabled", null, function(enabled){ + document.getElementById('onoffswitch').checked = enabled; + // Hide or show the rules sections + if (enabled) { + document.body.className = "" + } else { + document.body.className = "disabled" + } + sendMessage("update_state"); + }); } // Toggle extension enabled/disabled status function toggleEnabledDisabled() { - if (backgroundPage.isExtensionEnabled) { - // User wants to disable us - backgroundPage.isExtensionEnabled = false; - } else { - // User wants to enable us - backgroundPage.isExtensionEnabled = true; + var extension_toggle_effect = function(){ + updateEnabledDisabledUI(); + // The extension state changed, so reload this tab. + chrome.tabs.reload(); + window.close(); } - updateEnabledDisabledUI(); - // The extension state changed, so reload this tab. - chrome.tabs.reload(); - window.close(); + + sendMessage("get_is_extension_enabled", null, function(enabled){ + if (enabled) { + // User wants to disable us + sendMessage("set_is_extension_enabled", false, extension_toggle_effect); + } else { + // User wants to enable us + sendMessage("set_is_extension_enabled", true, extension_toggle_effect); + } + }); } /** @@ -130,21 +147,22 @@ function toggleEnabledDisabled() { */ function gotTab(tabArray) { var activeTab = tabArray[0]; - var rulesets = backgroundPage.activeRulesets.getRulesets(activeTab.id); - for (var r in rulesets) { - var listDiv = stableRules; - if (!rulesets[r].default_state) { - listDiv = unstableRules; + sendMessage("get_active_rulesets", activeTab.id, function(rulesets){ + for (var r in rulesets) { + var listDiv = stableRules; + if (!rulesets[r].default_state) { + listDiv = unstableRules; + } + appendRuleLineToListDiv(rulesets[r], listDiv); + listDiv.style.position = "static"; + listDiv.style.visibility = "visible"; } - appendRuleLineToListDiv(rulesets[r], listDiv); - listDiv.style.position = "static"; - listDiv.style.visibility = "visible"; - } - // Only show the "Add a rule" link if we're on an HTTPS page - if (/^https:/.test(activeTab.url)) { - show(e("add-rule-link")); - } + // Only show the "Add a rule" link if we're on an HTTPS page + if (/^https:/.test(activeTab.url)) { + show(e("add-rule-link")); + } + }); } /** @@ -223,7 +241,7 @@ function addManualRule() { redirectTo : e("new-rule-redirect").value, urlMatcher : e("new-rule-regex").value }; - backgroundPage.addNewRule(params, function() { + sendMessage("add_new_rule", params, function() { location.reload(); }); }); @@ -252,11 +270,20 @@ function toggleHttpNowhere() { function getOption_(opt, defaultOpt, callback) { var details = {}; details[opt] = defaultOpt; - return storage.get(details, callback); + sendMessage("get_option", details, callback); } function setOption_(opt, value) { var details = {}; details[opt] = value; - return storage.set(details); + sendMessage("set_option", details); +} + +function sendMessage(type, object, callback) { + var packet = {}; + packet.type = type; + if(object){ + packet.object = object; + } + chrome.runtime.sendMessage(packet, callback); } diff --git a/chromium/storage.js b/chromium/storage.js index 2597ca379fba..d75fe7794411 100644 --- a/chromium/storage.js +++ b/chromium/storage.js @@ -1,6 +1,10 @@ var storage = chrome.storage.local; if (chrome.storage.sync) { - storage = chrome.storage.sync; + chrome.storage.sync.set({"sync-set-test": true}, () => { + if(!chrome.runtime.lastError){ + storage = chrome.storage.sync; + } + }); } if (typeof exports != 'undefined') { exports = storage;