Ver código fonte

Fix broken dialogboxes

Sondre Njåstad 1 ano atrás
pai
commit
8e1dbc8189
4 arquivos alterados com 28 adições e 23 exclusões
  1. 2 1
      src/IPC.js
  2. 2 1
      src/UI/UIDesktop.js
  3. 20 19
      src/helpers.js
  4. 4 2
      src/initgui.js

+ 2 - 1
src/IPC.js

@@ -1036,7 +1036,8 @@ window.addEventListener('message', async (event) => {
                                     type: 'primary',
                                     type: 'primary',
                                 },
                                 },
                                 {
                                 {
-                                    label: i18n('cancel')
+                                    label: i18n('cancel'),
+                                    value: 'cancel'
                                 },
                                 },
                             ],
                             ],
                             parent_uuid: event.data.appInstanceID,
                             parent_uuid: event.data.appInstanceID,

+ 2 - 1
src/UI/UIDesktop.js

@@ -1201,6 +1201,7 @@ $(document).on('click', '.user-options-menu-btn', async function(e){
                             buttons:[
                             buttons:[
                                 {
                                 {
                                     label: i18n('close_all_Windows_and_log_out'),
                                     label: i18n('close_all_Windows_and_log_out'),
+                                    value: 'close_and_log_out',
                                     type: 'primary',
                                     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();
                             logout();
                     }
                     }
                     // no open windows
                     // no open windows

+ 20 - 19
src/helpers.js

@@ -1562,17 +1562,17 @@ window.copy_clipboard_items = async function(dest_path, dest_container_element){
                         const alert_resp = await UIAlert({
                         const alert_resp = await UIAlert({
                             message: `<strong>${html_encode(err.entry_name)}</strong> already exists.`,
                             message: `<strong>${html_encode(err.entry_name)}</strong> already exists.`,
                             buttons:[
                             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;
                             overwrite = true;
-                        }else if (alert_resp === 'Replace all'){
+                        }else if (alert_resp === 'replace_all'){
                             overwrite = true;
                             overwrite = true;
                             overwrite_all = 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;
                             item_with_same_name_already_exists = false;
                         }
                         }
                     }
                     }
@@ -1659,17 +1659,17 @@ window.copy_items = function(el_items, dest_path){
                         const alert_resp = await UIAlert({
                         const alert_resp = await UIAlert({
                             message: `<strong>${html_encode(err.entry_name)}</strong> already exists.`,
                             message: `<strong>${html_encode(err.entry_name)}</strong> already exists.`,
                             buttons:[
                             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;
                             overwrite = true;
-                        }else if (alert_resp === 'Replace all'){
+                        }else if (alert_resp === 'replace_all'){
                             overwrite = true;
                             overwrite = true;
                             overwrite_all = 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;
                             item_with_same_name_already_exists = false;
                         }
                         }
                     }
                     }
@@ -2206,6 +2206,7 @@ window.open_item = async function(options){
                     [
                     [
                     {
                     {
                         label: i18n('download_file'),
                         label: i18n('download_file'),
+                        value: 'download_file',
                         type: 'primary',
                         type: 'primary',
 
 
                     },
                     },
@@ -2213,7 +2214,7 @@ window.open_item = async function(options){
                         label: i18n('cancel')
                         label: i18n('cancel')
                     }
                     }
                 ])
                 ])
-            if(alert_resp === 'Download File'){
+            if(alert_resp === 'download_file'){
                 trigger_download([item_path]);
                 trigger_download([item_path]);
             }
             }
             return;
             return;
@@ -2583,17 +2584,17 @@ window.move_items = async function(el_items, dest_path, is_undo = false){
                     const alert_resp = await UIAlert({
                     const alert_resp = await UIAlert({
                         message: `<strong>${html_encode(err.entry_name)}</strong> already exists.`,
                         message: `<strong>${html_encode(err.entry_name)}</strong> already exists.`,
                         buttons:[
                         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;
                         overwrite = true;
-                    }else if (alert_resp === 'Replace all'){
+                    }else if (alert_resp === 'replace_all'){
                         overwrite = true;
                         overwrite = true;
                         overwrite_all = 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;
                         item_with_same_name_already_exists = false;
                     }
                     }
                 }
                 }

+ 4 - 2
src/initgui.js

@@ -1877,10 +1877,12 @@ window.initgui = async function(){
                 buttons:[
                 buttons:[
                     {
                     {
                         label: i18n('save_account'),
                         label: i18n('save_account'),
+                        value: 'save_account',
                         type: 'primary',
                         type: 'primary',
                     },
                     },
                     {
                     {
                         label: i18n('log_out'),
                         label: i18n('log_out'),
+                        value: 'log_out',
                         type: 'danger',
                         type: 'danger',
                     },
                     },
                     {
                     {
@@ -1888,14 +1890,14 @@ window.initgui = async function(){
                     },
                     },
                 ]
                 ]
             })
             })
-            if(alert_resp === 'Save Account'){
+            if(alert_resp === 'save_account'){
                 let saved = await UIWindowSaveAccount({
                 let saved = await UIWindowSaveAccount({
                     send_confirmation_code: false,
                     send_confirmation_code: false,
                     default_username: window.user.username
                     default_username: window.user.username
                 });
                 });
                 if(saved)
                 if(saved)
                     logout();
                     logout();
-            }else if (alert_resp === 'Log Out'){
+            }else if (alert_resp === 'log_out'){
                 logout();
                 logout();
             }
             }
             else{
             else{