Skip to content
This repository has been archived by the owner on Nov 6, 2023. It is now read-only.

Remove confirmation dialogue for resetting rule states to default in … #17094

Merged
merged 1 commit into from
Nov 28, 2018
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
14 changes: 14 additions & 0 deletions chromium/background-scripts/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -1027,6 +1027,20 @@ chrome.runtime.onMessage.addListener(function(message, sender, sendResponse){
check_if_site_disabled: () => {
sendResponse(disabledList.has(message.object));
return true;
},
is_firefox: () => {
if(typeof(browser) != "undefined"){
browser.runtime.getBrowserInfo().then(function(info) {
if (info.name == "Firefox") {
sendResponse(true);
} else {
sendResponse(false);
}
});
} else {
sendResponse(false);
}
return true;
}
};
if (message.type in responses) {
Expand Down
18 changes: 13 additions & 5 deletions chromium/pages/popup/ux.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,19 @@ document.addEventListener("DOMContentLoaded", function () {
e('onoffswitch').addEventListener('click', toggleEnabledDisabled);
e('http-nowhere-checkbox').addEventListener('click', toggleHttpNowhere, false);
e('reset-to-defaults').addEventListener('click', () => {
if (confirm(chrome.i18n.getMessage("prefs_reset_defaults_message"))) {
sendMessage("reset_to_defaults", null, () => {
window.close();
});
}
sendMessage("is_firefox", null, is_firefox => {
if (is_firefox) {
sendMessage("reset_to_defaults", null, () => {
window.close();
});
} else {
if (confirm(chrome.i18n.getMessage("prefs_reset_defaults_message"))) {
sendMessage("reset_to_defaults", null, () => {
window.close();
});
}
}
});
});

// Print the extension's current version.
Expand Down