proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-10 14:57:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ui: utils: drop some useles _array helpers, just use Object.entries

Browse Source 
if we need to enforce ordering it may help to reintroduce them
though.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-04-26 09:05:35 +02:00
parent b7004b4682
commit 56148f253e
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/manager6/Utils.js
View File

@ -581,7 +581,6 @@ Ext.define('PVE.Utils', {
//th: 'Thai', //th: 'Thai',
tr: 'Turkish', tr: 'Turkish',
}, },
kvm_keymap_array: () => Object.entries(PVE.Utils.kvm_keymaps),
kvm_vga_drivers: { kvm_vga_drivers: {
'__default__': Proxmox.Utils.defaultText, '__default__': Proxmox.Utils.defaultText,
@ -598,7 +597,6 @@ Ext.define('PVE.Utils', {
virtio: 'VirtIO-GPU', virtio: 'VirtIO-GPU',
none: Proxmox.Utils.noneText, none: Proxmox.Utils.noneText,
}, },
kvm_vga_driver_array: () => Object.entries(PVE.Utils.kvm_vga_drivers),
render_kvm_language: function(value) { render_kvm_language: function(value) {
if (!value) { if (!value) {
@ -614,7 +612,6 @@ Ext.define('PVE.Utils', {
'html5': 'HTML5 (noVNC)', 'html5': 'HTML5 (noVNC)',
'xtermjs': 'xterm.js', 'xtermjs': 'xterm.js',
}, },
console_viewer_array: () => Object.entries(PVE.Utils.console_map),
render_console_viewer: function(value) { render_console_viewer: function(value) {
value = value || '__default__'; value = value || '__default__';

4
www/manager6/dc/OptionView.js
View File

@ -70,7 +70,7 @@ Ext.define('PVE.dc.OptionView', {
me.add_combobox_row('keyboard', gettext('Keyboard Layout'), { me.add_combobox_row('keyboard', gettext('Keyboard Layout'), {
renderer: PVE.Utils.render_kvm_language, renderer: PVE.Utils.render_kvm_language,
comboItems: PVE.Utils.kvm_keymap_array(), comboItems: Object.entries(PVE.Utils.kvm_keymaps),
defaultValue: '__default__', defaultValue: '__default__',
deleteEmpty: true, deleteEmpty: true,
}); });
@ -81,7 +81,7 @@ Ext.define('PVE.dc.OptionView', {
}); });
me.add_combobox_row('console', gettext('Console Viewer'), { me.add_combobox_row('console', gettext('Console Viewer'), {
renderer: PVE.Utils.render_console_viewer, renderer: PVE.Utils.render_console_viewer,
comboItems: PVE.Utils.console_viewer_array(), comboItems: Object.entries(PVE.Utils.console_map),
defaultValue: '__default__', defaultValue: '__default__',
deleteEmpty: true, deleteEmpty: true,
}); });

2
www/manager6/form/VNCKeyboardSelector.js
View File

@ -1,5 +1,5 @@
Ext.define('PVE.form.VNCKeyboardSelector', { Ext.define('PVE.form.VNCKeyboardSelector', {
extend: 'Proxmox.form.KVComboBox', extend: 'Proxmox.form.KVComboBox',
alias: ['widget.VNCKeyboardSelector'], alias: ['widget.VNCKeyboardSelector'],
comboItems: PVE.Utils.kvm_keymap_array(), comboItems: Object.entries(PVE.Utils.kvm_keymaps),
}); });

2
www/manager6/qemu/DisplayEdit.js
View File

@ -17,7 +17,7 @@ Ext.define('PVE.qemu.DisplayInputPanel', {
value: '__default__', value: '__default__',
deleteEmpty: false, deleteEmpty: false,
fieldLabel: gettext('Graphic card'), fieldLabel: gettext('Graphic card'),
comboItems: PVE.Utils.kvm_vga_driver_array(), comboItems: Object.entries(PVE.Utils.kvm_vga_drivers),
validator: function(v) { validator: function(v) {
let cfg = this.up('proxmoxWindowEdit').vmconfig || {}; let cfg = this.up('proxmoxWindowEdit').vmconfig || {};

2
www/manager6/qemu/SystemEdit.js
View File

@ -80,7 +80,7 @@ Ext.define('PVE.qemu.SystemInputPanel', {
deleteEmpty: false, deleteEmpty: false,
fieldLabel: gettext('Graphic card'), fieldLabel: gettext('Graphic card'),
name: 'vga', name: 'vga',
comboItems: PVE.Utils.kvm_vga_driver_array(), comboItems: Object.entries(PVE.Utils.kvm_vga_drivers),
}, },
{ {
xtype: 'proxmoxKVComboBox', xtype: 'proxmoxKVComboBox',