From 8e1dbc8189d3e3c32fa5e3b40eeacc376db3332a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sondre=20Nj=C3=A5stad?= Date: Mon, 18 Mar 2024 21:16:33 +0100 Subject: [PATCH] Fix broken dialogboxes --- src/IPC.js | 3 ++- src/UI/UIDesktop.js | 3 ++- src/helpers.js | 39 ++++++++++++++++++++------------------- src/initgui.js | 6 ++++-- 4 files changed, 28 insertions(+), 23 deletions(-) diff --git a/src/IPC.js b/src/IPC.js index 2800e36ca..d1b5cb822 100644 --- a/src/IPC.js +++ b/src/IPC.js @@ -1036,7 +1036,8 @@ window.addEventListener('message', async (event) => { type: 'primary', }, { - label: i18n('cancel') + label: i18n('cancel'), + value: 'cancel' }, ], parent_uuid: event.data.appInstanceID, diff --git a/src/UI/UIDesktop.js b/src/UI/UIDesktop.js index 57bd23364..88d55b9eb 100644 --- a/src/UI/UIDesktop.js +++ b/src/UI/UIDesktop.js @@ -1201,6 +1201,7 @@ $(document).on('click', '.user-options-menu-btn', async function(e){ buttons:[ { label: i18n('close_all_Windows_and_log_out'), + value: 'close_and_log_out', type: 'primary', }, { @@ -1208,7 +1209,7 @@ $(document).on('click', '.user-options-menu-btn', async function(e){ }, ] }) - if(alert_resp === i18n('close_all_Windows_and_log_out')) + if(alert_resp === 'close_and_log_out') logout(); } // no open windows diff --git a/src/helpers.js b/src/helpers.js index fe45b1e89..66f558f3b 100644 --- a/src/helpers.js +++ b/src/helpers.js @@ -1562,17 +1562,17 @@ window.copy_clipboard_items = async function(dest_path, dest_container_element){ const alert_resp = await UIAlert({ message: `${html_encode(err.entry_name)} already exists.`, buttons:[ - {label: i18n('replace'), type: 'primary'}, - ... (clipboard.length > 1) ? [{label: i18n('replace_all')}] : [], - ... (clipboard.length > 1) ? [{label: i18n('skip')}] : [{label: i18n('cancel')}], + {label: i18n('replace'), type: 'primary', value: 'replace'}, + ... (clipboard.length > 1) ? [{label: i18n('replace_all'), value: 'replace_all'}] : [], + ... (clipboard.length > 1) ? [{label: i18n('skip'), value: 'skip'}] : [{label: i18n('cancel'), value: 'cancel'}], ] }) - if(alert_resp === 'Replace'){ + if(alert_resp === 'replace'){ overwrite = true; - }else if (alert_resp === 'Replace all'){ + }else if (alert_resp === 'replace_all'){ overwrite = true; overwrite_all = true; - }else if(alert_resp === 'Skip' || alert_resp === 'cancel'){ + }else if(alert_resp === 'skip' || alert_resp === 'cancel'){ item_with_same_name_already_exists = false; } } @@ -1659,17 +1659,17 @@ window.copy_items = function(el_items, dest_path){ const alert_resp = await UIAlert({ message: `${html_encode(err.entry_name)} already exists.`, buttons:[ - { label: i18n('replace'), type: 'primary' }, - ... (el_items.length > 1) ? [{label: i18n('replace_all')}] : [], - ... (el_items.length > 1) ? [{label: i18n('skip')}] : [{label: i18n('cancel')}], + { label: i18n('replace'), type: 'primary', value: 'replace' }, + ... (el_items.length > 1) ? [{label: i18n('replace_all'), value: 'replace_all'}] : [], + ... (el_items.length > 1) ? [{label: i18n('skip'), value: 'skip'}] : [{label: i18n('cancel'), value: 'cancel'}], ] }) - if(alert_resp === 'Replace'){ + if(alert_resp === 'replace'){ overwrite = true; - }else if (alert_resp === 'Replace all'){ + }else if (alert_resp === 'replace_all'){ overwrite = true; overwrite_all = true; - }else if(alert_resp === 'Skip' || alert_resp === 'cancel'){ + }else if(alert_resp === 'skip' || alert_resp === 'cancel'){ item_with_same_name_already_exists = false; } } @@ -2206,6 +2206,7 @@ window.open_item = async function(options){ [ { label: i18n('download_file'), + value: 'download_file', type: 'primary', }, @@ -2213,7 +2214,7 @@ window.open_item = async function(options){ label: i18n('cancel') } ]) - if(alert_resp === 'Download File'){ + if(alert_resp === 'download_file'){ trigger_download([item_path]); } return; @@ -2583,17 +2584,17 @@ window.move_items = async function(el_items, dest_path, is_undo = false){ const alert_resp = await UIAlert({ message: `${html_encode(err.entry_name)} already exists.`, buttons:[ - { label: i18n('replace'), type: 'primary',}, - ... (el_items.length > 1) ? [{label: i18n('replace_all')}] : [], - ... (el_items.length > 1) ? [{label: i18n('skip')}] : [{label: i18n('cancel')}], + { label: i18n('replace'), type: 'primary', value: 'replace' }, + ... (el_items.length > 1) ? [{label: i18n('replace_all'), value: 'replace_all'}] : [], + ... (el_items.length > 1) ? [{label: i18n('skip'), value: 'skip'}] : [{label: i18n('cancel'), value: 'cancel'}], ] }) - if(alert_resp === 'Replace'){ + if(alert_resp === 'replace'){ overwrite = true; - }else if (alert_resp === 'Replace all'){ + }else if (alert_resp === 'replace_all'){ overwrite = true; overwrite_all = true; - }else if(alert_resp === 'Skip' || alert_resp === 'cancel'){ + }else if(alert_resp === 'skip' || alert_resp === 'cancel'){ item_with_same_name_already_exists = false; } } diff --git a/src/initgui.js b/src/initgui.js index 971cf2df8..6697ffa50 100644 --- a/src/initgui.js +++ b/src/initgui.js @@ -1877,10 +1877,12 @@ window.initgui = async function(){ buttons:[ { label: i18n('save_account'), + value: 'save_account', type: 'primary', }, { label: i18n('log_out'), + value: 'log_out', type: 'danger', }, { @@ -1888,14 +1890,14 @@ window.initgui = async function(){ }, ] }) - if(alert_resp === 'Save Account'){ + if(alert_resp === 'save_account'){ let saved = await UIWindowSaveAccount({ send_confirmation_code: false, default_username: window.user.username }); if(saved) logout(); - }else if (alert_resp === 'Log Out'){ + }else if (alert_resp === 'log_out'){ logout(); } else{