optim custom dialog

press "enter" and go for simpler dialogs
RoderickQiu · Aug 2, 2023 · affbeed · affbeed
1 parent bf1015b
commit affbeed
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 18 deletions.
diff --git a/custom-dialog.html b/custom-dialog.html
@@ -61,8 +61,11 @@
             $("#dialog-msg").text(message.msg);
             executeAfter = message.executeAfter;
             ipc.send("custom-dialog-fit", Math.round(msgNode.height() / parseFloat(msgNode.css('line-height'))));
-            if (message.type === 1 || message.type === 2) $("#dialog-cancel").removeClass("d-none"); //select_on
+            document.onkeydown = function () {
+            };
+            if (message.type === 1 || message.type === 2) $("#dialog-cancel").removeClass("d-none");
             else $("#dialog-cancel").addClass("d-none");
+
             if (message.type === 2) { //update_on
                 $("#dialog-cancel").text(i18n.__('update-refuse'));
                 $("#dialog-button-3").removeClass("d-none");
@@ -77,6 +80,15 @@
                 $("#timer").css("width", "210px");
                 $("#dialog-buttons").css("width", "210px");
             }
+
+            if (message.type === 0) {//on
+                document.onkeydown = function (event1) {
+                    let ev = document.all ? window.event : event1;
+                    if ((ev.keyCode || ev.which) === 13) {
+                        ok();
+                    }
+                }
+            }
         })
     </script>
     <script src="renderer.js"></script>

diff --git a/main.js b/main.js
@@ -739,33 +739,36 @@ function customDialog(mode, title, msg, executeAfter) {
     }
     if (executeAfter == null) executeAfter = "";
     if (mode === "on" || mode === "select_on" || mode === "update_on") {
-        customDialogWin.webContents.send("dialog-init", {
-            title: title,
-            msg: msg,
-            executeAfter: executeAfter,
-            type: getCustomDialogModeType(mode)
-        });
-        customDialogWin.show();
-        customDialogWin.setAlwaysOnTop(true, "pop-up-menu");
-        customDialogWin.focus();
-        if (mode === "update_on") {
-            customDialogWin.setSize(Math.floor(240 * ratio) * 2, customDialogWin.getSize()[1]);
-        } else {
-            customDialogWin.setSize(Math.floor(240 * ratio), customDialogWin.getSize()[1]);
+        if (customDialogWin != null) {
+            customDialogWin.webContents.send("dialog-init", {
+                title: title,
+                msg: msg,
+                executeAfter: executeAfter,
+                type: getCustomDialogModeType(mode)
+            });
+            customDialogWin.show();
+            customDialogWin.setAlwaysOnTop(true, "pop-up-menu");
+            customDialogWin.focus();
+            if (mode === "update_on") {
+                customDialogWin.setSize(Math.floor(240 * ratio) * 2, customDialogWin.getSize()[1]);
+            } else {
+                customDialogWin.setSize(Math.floor(240 * ratio), customDialogWin.getSize()[1]);
+            }
+            customDialogWin.center();
         }
-        customDialogWin.center();
     } else if (mode === "off") {
-        customDialogWin.hide();
+        if (customDialogWin != null) customDialogWin.hide();
         try {
             eval(executeAfter);
         } catch (e) {
             console.log(e);
         }
     } else if (mode === "cancel") {
-        customDialogWin.hide();
+        if (customDialogWin != null) customDialogWin.hide();
     } else if (mode === "button3_update") {
         shell.openExternal("https://github.com/RoderickQiu/wnr/releases/latest");
-        customDialogWin.hide();
+
+        if (customDialogWin != null) customDialogWin.hide();
     }
 }