diff --git a/addon/chrome/content/dialogs/promptservice.js b/addon/chrome/content/dialogs/promptservice.js
index 84d5b9c0..4fd57c60 100644
--- a/addon/chrome/content/dialogs/promptservice.js
+++ b/addon/chrome/content/dialogs/promptservice.js
@@ -44,6 +44,11 @@ function prompt_init() {
}
documentElement = document.documentElement;
+ const dialog = documentElement;
+ dialog.addEventListener("dialogaccept", prompt_deinit.bind(dialog, 0));
+ dialog.addEventListener("dialogcancel", prompt_deinit.bind(dialog, 1));
+ dialog.addEventListener("dialogextra1", prompt_extra1.bind(dialog, 2));
+
dialogParams = window.arguments[0].QueryInterface(Ci.nsIDialogParamBlock);
document.title = dialogParams.GetString(0);
@@ -127,7 +132,6 @@ function prompt_init() {
// Set and focus default button
var dButton = buttons[dialogParams.GetInt(0)] ?? "accept";
- var dialog = documentElement;
dialog.defaultButton = dButton;
if (gHideElmParam == TMP_HIDE_MENUANDTEXT) { // hide menulist & text box and set focus to default Button
document.getElementById("space_before_checkbox").hidden = true;
diff --git a/addon/chrome/content/dialogs/promptservice.xhtml b/addon/chrome/content/dialogs/promptservice.xhtml
index 3fe0bb00..63e5c7ad 100644
--- a/addon/chrome/content/dialogs/promptservice.xhtml
+++ b/addon/chrome/content/dialogs/promptservice.xhtml
@@ -1,5 +1,6 @@
+
@@ -12,21 +13,11 @@
resizable="no"
onload="prompt_init();"
buttons="accept, cancel, extra1"
- ondialogaccept="return prompt_deinit(0);"
- ondialogcancel="return prompt_deinit(1);"
- ondialogextra1="return prompt_extra1(2);"
buttonpack="center"
style="-moz-user-focus: ignore; padding: 8px 10px 10px 8px;">
-
-
-
+
+
diff --git a/addon/chrome/content/overlay/autoReload.js b/addon/chrome/content/overlay/autoReload.js
index a8ed1f4b..faba63e2 100644
--- a/addon/chrome/content/overlay/autoReload.js
+++ b/addon/chrome/content/overlay/autoReload.js
@@ -7,6 +7,7 @@ const {TabmixSvc} = ChromeUtils.import("chrome://tabmix-resource/content/TabmixS
const gPref = TabmixSvc.prefBranch;
function load() {
+ document.documentElement.addEventListener("dialogaccept", accept.bind(null));
const customReloadTime = gPref.getIntPref("reload_time");
document.getElementById("autoreload_minutes").value = String(Math.floor(customReloadTime / 60));
document.getElementById("autoreload_seconds").value = String(customReloadTime % 60);
diff --git a/addon/chrome/content/overlay/autoReload.xhtml b/addon/chrome/content/overlay/autoReload.xhtml
index 3b8d669f..d12a6bdb 100644
--- a/addon/chrome/content/overlay/autoReload.xhtml
+++ b/addon/chrome/content/overlay/autoReload.xhtml
@@ -16,17 +16,11 @@