Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions chromium/pages/devtools/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<title></title>
<script src="../send-message.js"></script>
<script src="ux.js"></script>
</head>
<body></body>
Expand Down
20 changes: 15 additions & 5 deletions chromium/pages/devtools/ux.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
/* global sendMessage */

"use strict";

chrome.devtools.panels.create("HTTPS Everywhere",
"/images/icons/icon-active-38.png",
"/pages/devtools/panel.html",
function() { }
);
const defaultOptions = {
showDevtoolsTab: true
};

sendMessage("get_option", defaultOptions, item => {
if (item.showDevtoolsTab) {
chrome.devtools.panels.create("HTTPS Everywhere",
"/images/icons/icon-active-38.png",
"/pages/devtools/panel.html",
function() { }
);
}
});
4 changes: 4 additions & 0 deletions chromium/pages/options/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
<input type="checkbox" id="enableMixedRulesets">
<label for="enableMixedRulesets" data-i18n="options_enableMixedRulesets"></label>
</div>
<div id="show-devtools-tab-wrapper" class="general-settings-wrapper">
<input type="checkbox" id="showDevtoolsTab">
<label for="showDevtoolsTab" data-i18n="options_showDevtoolsTab"></label>
</div>

<div id="import-confirmed" data-i18n="options_imported"></div>

Expand Down
2 changes: 1 addition & 1 deletion chromium/pages/options/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
margin-bottom: 20px;
}

.general-settings-wrapper#mixed-rulesets-wrapper{
.general-settings-wrapper#show-devtools-tab-wrapper{
margin-bottom: 20px;
}

Expand Down
9 changes: 8 additions & 1 deletion chromium/pages/options/ux.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,20 @@ document.addEventListener("DOMContentLoaded", () => {
const showCounter = document.getElementById("showCounter");
const autoUpdateRulesets = document.getElementById("autoUpdateRulesets");
const enableMixedRulesets = document.getElementById("enableMixedRulesets");
const showDevtoolsTab = document.getElementById("showDevtoolsTab");

const defaultOptions = {
showCounter: true,
autoUpdateRulesets: true,
enableMixedRulesets: false,
showDevtoolsTab: true
};

sendMessage("get_option", defaultOptions, item => {
showCounter.checked = item.showCounter;
autoUpdateRulesets.checked = item.autoUpdateRulesets;
enableMixedRulesets.checked = item.enableMixedRulesets;
showDevtoolsTab.checked = item.showDevtoolsTab;

showCounter.addEventListener("change", () => {
sendMessage("set_option", { showCounter: showCounter.checked });
Expand All @@ -55,7 +58,11 @@ document.addEventListener("DOMContentLoaded", () => {

enableMixedRulesets.addEventListener("change", () => {
sendMessage("set_option", { enableMixedRulesets: enableMixedRulesets.checked });
})
});

showDevtoolsTab.addEventListener("change", () => {
sendMessage("set_option", { showDevtoolsTab: showDevtoolsTab.checked });
});
});

document.onkeydown = function(evt) {
Expand Down
1 change: 1 addition & 0 deletions src/chrome/locale/en/https-everywhere.dtd
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<!ENTITY https-everywhere.options.importSettings "Import Settings">
<!ENTITY https-everywhere.options.import "Import">
<!ENTITY https-everywhere.options.enableMixedRulesets "Enable mixed content rulesets">
<!ENTITY https-everywhere.options.showDevtoolsTab "Show Devtools tab">
<!ENTITY https-everywhere.options.autoUpdateRulesets "Auto-update rulesets">
<!ENTITY https-everywhere.options.imported "Your settings have been imported.">

Expand Down