From 53e3ea8488281c189ed2f16e6107b2adc43a0fdf Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 19 Jan 2021 17:42:36 +0100 Subject: [PATCH] ui: eslint: enforce "no-extra-parens" rule Signed-off-by: Thomas Lamprecht --- www/manager6/Utils.js | 28 ++++++++++++------------ www/manager6/Workspace.js | 4 ++-- www/manager6/button/Split.js | 6 ++--- www/manager6/ceph/FS.js | 2 +- www/manager6/ceph/OSD.js | 2 +- www/manager6/ceph/Services.js | 2 +- www/manager6/ceph/Status.js | 4 ++-- www/manager6/ceph/StatusDetail.js | 2 +- www/manager6/data/ResourceStore.js | 4 ++-- www/manager6/dc/Backup.js | 4 ++-- www/manager6/dc/CorosyncLinkEdit.js | 2 +- www/manager6/dc/Health.js | 2 +- www/manager6/dc/NodeView.js | 2 +- www/manager6/dc/OptionView.js | 2 +- www/manager6/dc/SecurityGroups.js | 4 ++-- www/manager6/dc/Summary.js | 10 ++++----- www/manager6/dc/TFAEdit.js | 6 ++--- www/manager6/form/BridgeSelector.js | 2 +- www/manager6/form/DiskStorageSelector.js | 2 +- www/manager6/form/FileSelector.js | 4 ++-- www/manager6/form/GlobalSearchField.js | 2 +- www/manager6/form/MDevSelector.js | 4 ++-- www/manager6/form/MemoryField.js | 4 ++-- www/manager6/form/NodeSelector.js | 2 +- www/manager6/form/PCISelector.js | 2 +- www/manager6/form/StorageSelector.js | 4 ++-- www/manager6/form/USBSelector.js | 2 +- www/manager6/form/ViewSelector.js | 2 +- www/manager6/grid/FirewallAliases.js | 2 +- www/manager6/grid/FirewallRules.js | 6 ++--- www/manager6/grid/PoolMembers.js | 2 +- www/manager6/grid/Replication.js | 4 ++-- www/manager6/ha/GroupEdit.js | 2 +- www/manager6/ha/ResourceEdit.js | 4 ++-- www/manager6/ha/Status.js | 2 +- www/manager6/ha/StatusView.js | 2 +- www/manager6/lxc/Config.js | 2 +- www/manager6/lxc/FeaturesEdit.js | 4 ++-- www/manager6/lxc/Network.js | 16 +++++++------- www/manager6/lxc/Resources.js | 6 ++--- www/manager6/node/LVM.js | 4 ++-- www/manager6/node/ZFS.js | 2 +- www/manager6/panel/ConfigPanel.js | 4 ++-- www/manager6/panel/IPSet.js | 2 +- www/manager6/panel/RunningChart.js | 2 +- www/manager6/panel/StatusPanel.js | 2 +- www/manager6/qemu/AgentIPView.js | 4 ++-- www/manager6/qemu/BootOrderEdit.js | 4 ++-- www/manager6/qemu/CDEdit.js | 2 +- www/manager6/qemu/Config.js | 4 ++-- www/manager6/qemu/HDEdit.js | 4 ++-- www/manager6/qemu/HDMove.js | 4 ++-- www/manager6/qemu/HardwareView.js | 22 +++++++++---------- www/manager6/qemu/MemoryEdit.js | 6 ++--- www/manager6/qemu/NetworkEdit.js | 2 +- www/manager6/qemu/OSDefaults.js | 2 +- www/manager6/sdn/Status.js | 2 +- www/manager6/sdn/StatusView.js | 2 +- www/manager6/storage/IScsiEdit.js | 2 +- www/manager6/storage/ImageView.js | 2 +- www/manager6/storage/TemplateView.js | 4 ++-- www/manager6/tree/ResourceTree.js | 10 ++++----- www/manager6/window/Backup.js | 2 +- www/manager6/window/BulkAction.js | 4 ++-- www/manager6/window/Restore.js | 8 +++---- 65 files changed, 137 insertions(+), 137 deletions(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 5d476600..07482303 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -308,7 +308,7 @@ Ext.define('PVE.Utils', { selected.forEach(function(item) { cur++; if (item > 2) { - days.push(Ext.Date.dayNames[(cur+1)] + '-' + Ext.Date.dayNames[(cur+item)%7]); + days.push(Ext.Date.dayNames[cur+1] + '-' + Ext.Date.dayNames[(cur+item)%7]); cur += item-1; } else if (item == 2) { days.push(Ext.Date.dayNames[cur+1]); @@ -376,7 +376,7 @@ Ext.define('PVE.Utils', { render_hotplug_features: function(value) { var fa = []; - if (!value || (value === '0')) { + if (!value || value === '0') { return gettext('Disabled'); } @@ -445,7 +445,7 @@ Ext.define('PVE.Utils', { }, render_qemu_machine: function(value) { - return value || (Proxmox.Utils.defaultText + ' (i440fx)'); + return value || Proxmox.Utils.defaultText + ' (i440fx)'; }, render_qemu_bios: function(value) { @@ -468,7 +468,7 @@ Ext.define('PVE.Utils', { } }, render_as_property_string: function(value) { - return (!value) ? Proxmox.Utils.defaultText + return !value ? Proxmox.Utils.defaultText : PVE.Parser.printPropertyString(value); }, @@ -879,9 +879,9 @@ Ext.define('PVE.Utils', { format_storage_type: function(value, md, record) { if (value === 'rbd') { - value = (!record || record.get('monhost') ? 'rbd' : 'pveceph'); + value = !record || record.get('monhost') ? 'rbd' : 'pveceph'; } else if (value === 'cephfs') { - value = (!record || record.get('monhost') ? 'cephfs' : 'pvecephfs'); + value = !record || record.get('monhost') ? 'cephfs' : 'pvecephfs'; } var schema = PVE.Utils.storageSchema[value]; @@ -933,7 +933,7 @@ Ext.define('PVE.Utils', { var maxcpu = record.data.maxcpu || 1; - if (!Ext.isNumeric(maxcpu) && (maxcpu >= 1)) { + if (!Ext.isNumeric(maxcpu) && maxcpu >= 1) { return ''; } @@ -969,7 +969,7 @@ Ext.define('PVE.Utils', { return -1; } - return (data.mem / data.maxmem); + return data.mem / data.maxmem; }, render_mem_usage_percent: function(value, metaData, record, rowIndex, colIndex, store) { @@ -986,7 +986,7 @@ Ext.define('PVE.Utils', { return ''; } - return ((mem*100)/maxmem).toFixed(1) + " %"; + return (mem*100/maxmem).toFixed(1) + " %"; } return (value*100).toFixed(1) + " %"; }, @@ -1009,12 +1009,12 @@ Ext.define('PVE.Utils', { calculate_disk_usage: function(data) { if (!Ext.isNumeric(data.disk) || data.type === 'qemu' || - (data.type === 'lxc' && data.uptime === 0) || + data.type === 'lxc' && data.uptime === 0 || data.maxdisk === 0) { return -1; } - return (data.disk / data.maxdisk); + return data.disk / data.maxdisk; }, render_disk_usage_percent: function(value, metaData, record, rowIndex, colIndex, store) { @@ -1033,7 +1033,7 @@ Ext.define('PVE.Utils', { if (!Ext.isNumeric(disk) || type === 'qemu' || maxdisk === 0 || - (type === 'lxc' && record.data.uptime === 0)) { + type === 'lxc' && record.data.uptime === 0) { return ''; } @@ -1211,9 +1211,9 @@ Ext.define('PVE.Utils', { } var dv = PVE.VersionInfo.console || 'xtermjs'; if (dv === 'vv' && !allowSpice) { - dv = (allowXtermjs) ? 'xtermjs' : 'html5'; + dv = allowXtermjs ? 'xtermjs' : 'html5'; } else if (dv === 'xtermjs' && !allowXtermjs) { - dv = (allowSpice) ? 'vv' : 'html5'; + dv = allowSpice ? 'vv' : 'html5'; } return dv; diff --git a/www/manager6/Workspace.js b/www/manager6/Workspace.js index c9c4808d..0c1b9e0c 100644 --- a/www/manager6/Workspace.js +++ b/www/manager6/Workspace.js @@ -231,7 +231,7 @@ Ext.define('PVE.StdWorkspace', { var comp = { xtype: tlckup[n.data.type || 'root'] || 'pvePanelConfig', - showSearch: (n.data.id === 'root') || + showSearch: n.data.id === 'root' || Ext.isDefined(n.data.groupbyid), pveSelNode: n, workspace: me, @@ -455,7 +455,7 @@ Ext.define('PVE.StdWorkspace', { listeners: { resize: function(panel, width, height) { var viewHeight = me.getSize().height; - if (height > (viewHeight - 150)) { + if (height > viewHeight - 150) { panel.setHeight(viewHeight - 150); } }, diff --git a/www/manager6/button/Split.js b/www/manager6/button/Split.js index 93d60835..ea001dbb 100644 --- a/www/manager6/button/Split.js +++ b/www/manager6/button/Split.js @@ -25,7 +25,7 @@ Ext.define('PVE.button.Split', { var rec, msg; if (me.selModel) { rec = me.selModel.getSelection()[0]; - if (!rec || (me.enableFn(rec) === false)) { + if (!rec || me.enableFn(rec) === false) { return; } } @@ -72,7 +72,7 @@ Ext.define('PVE.button.Split', { if (item.selModel) { me.mon(item.selModel, "selectionchange", function() { var rec = item.selModel.getSelection()[0]; - if (!rec || (item.enableFn(rec) === false)) { + if (!rec || item.enableFn(rec) === false) { item.setDisabled(true); } else { item.setDisabled(false); @@ -87,7 +87,7 @@ Ext.define('PVE.button.Split', { if (me.selModel) { me.mon(me.selModel, "selectionchange", function() { var rec = me.selModel.getSelection()[0]; - if (!rec || (me.enableFn(rec) === false)) { + if (!rec || me.enableFn(rec) === false) { me.setDisabled(true); } else { me.setDisabled(false); diff --git a/www/manager6/ceph/FS.js b/www/manager6/ceph/FS.js index 397e90f9..31f0b582 100644 --- a/www/manager6/ceph/FS.js +++ b/www/manager6/ceph/FS.js @@ -91,7 +91,7 @@ Ext.define('PVE.NodeCephFSPanel', { }, formulas: { canCreateFS: function(get) { - return (!get('cephfsConfigured') && get('mdsCount') > 0); + return !get('cephfsConfigured') && get('mdsCount') > 0; }, }, }, diff --git a/www/manager6/ceph/OSD.js b/www/manager6/ceph/OSD.js index a4bf358a..421502dc 100644 --- a/www/manager6/ceph/OSD.js +++ b/www/manager6/ceph/OSD.js @@ -460,7 +460,7 @@ Ext.define('PVE.node.CephOsdTree', { let rec = selection[0]; let vm = this.getViewModel(); - let isOsd = rec.data.host && (rec.data.type === 'osd') && (rec.data.id >= 0); + let isOsd = rec.data.host && rec.data.type === 'osd' && rec.data.id >= 0; vm.set('isOsd', isOsd); vm.set('downOsd', isOsd && rec.data.status === 'down'); diff --git a/www/manager6/ceph/Services.js b/www/manager6/ceph/Services.js index 3248546d..d8cdbaf8 100644 --- a/www/manager6/ceph/Services.js +++ b/www/manager6/ceph/Services.js @@ -65,7 +65,7 @@ Ext.define('PVE.ceph.Services', { } }); var i; - var quorummap = (status && status.quorum_names) ? status.quorum_names : []; + var quorummap = status && status.quorum_names ? status.quorum_names : []; var monmessages = {}; var mgrmessages = {}; var mdsmessages = {}; diff --git a/www/manager6/ceph/Status.js b/www/manager6/ceph/Status.js index 9c77d4ed..96b190c0 100644 --- a/www/manager6/ceph/Status.js +++ b/www/manager6/ceph/Status.js @@ -335,7 +335,7 @@ Ext.define('PVE.node.CephStatus', { if (pgmap.recovering_objects_per_sec !== undefined || unhealthy > 0) { let total = pgmap.misplaced_total || pgmap.unfound_total || pgmap.degraded_total || 0; if (total === 0) return; - let recovered = (total - unhealthy) || 0; + let recovered = total - unhealthy || 0; let speed = pgmap.recovering_bytes_per_sec || 0; let speedTxt = PVE.Utils.render_bandwidth(speed); let obj_per_sec = speed / (4*1024*1024); // 4MiB per Object @@ -392,7 +392,7 @@ Ext.define('PVE.node.CephStatus', { var regex = new RegExp("not (installed|initialized)", "i"); PVE.Utils.handleStoreErrorOrMask(me, me.store, regex, function(me, error) { me.store.stopUpdate(); - PVE.Utils.showCephInstallOrMask(me, error.statusText, (nodename || 'localhost'), + PVE.Utils.showCephInstallOrMask(me, error.statusText, nodename || 'localhost', function(win) { me.mon(win, 'cephInstallWindowClosed', function() { me.store.startUpdate(); diff --git a/www/manager6/ceph/StatusDetail.js b/www/manager6/ceph/StatusDetail.js index 716b6a01..dfd6d103 100644 --- a/www/manager6/ceph/StatusDetail.js +++ b/www/manager6/ceph/StatusDetail.js @@ -216,7 +216,7 @@ Ext.define('PVE.ceph.StatusDetail', { var pgmap = status.pgmap || {}; var pgs_by_state = pgmap.pgs_by_state || []; pgs_by_state.sort(function(a, b) { - return (a.state_name < b.state_name)?-1:(a.state_name === b.state_name)?0:1; + return a.state_name < b.state_name?-1:a.state_name === b.state_name?0:1; }); me.statecategories.forEach(function(cat) { diff --git a/www/manager6/data/ResourceStore.js b/www/manager6/data/ResourceStore.js index 3b466f85..e94cdd43 100644 --- a/www/manager6/data/ResourceStore.js +++ b/www/manager6/data/ResourceStore.js @@ -5,7 +5,7 @@ Ext.define('PVE.data.ResourceStore', { findVMID: function(vmid) { var me = this, i; - return (me.findExact('vmid', parseInt(vmid, 10)) >= 0); + return me.findExact('vmid', parseInt(vmid, 10)) >= 0; }, // returns the cached data from all nodes @@ -81,7 +81,7 @@ Ext.define('PVE.data.ResourceStore', { hidden: true, convert: function(value, record) { var info = record.data; - return (Ext.isNumeric(info.uptime) && (info.uptime > 0)); + return Ext.isNumeric(info.uptime) && info.uptime > 0; }, }, text: { diff --git a/www/manager6/dc/Backup.js b/www/manager6/dc/Backup.js index 83f5beaf..0efc9d49 100644 --- a/www/manager6/dc/Backup.js +++ b/www/manager6/dc/Backup.js @@ -165,7 +165,7 @@ Ext.define('PVE.dc.BackupEdit', { var mode = selModeField.getValue(); store.clearFilter(); store.filterBy(function(rec) { - return (!value || rec.get('node') === value); + return !value || rec.get('node') === value; }); if (mode === 'all') { sm.selectAll(true); @@ -330,7 +330,7 @@ Ext.define('PVE.dc.BackupEdit', { var node = nodesel.getValue(); store.clearFilter(); store.filterBy(function(rec) { - return (!node || node.length === 0 || rec.get('node') === node); + return !node || node.length === 0 || rec.get('node') === node; }); var list = vmidField.getValue(); var mode = selModeField.getValue(); diff --git a/www/manager6/dc/CorosyncLinkEdit.js b/www/manager6/dc/CorosyncLinkEdit.js index a6e1ecc5..a5213b81 100644 --- a/www/manager6/dc/CorosyncLinkEdit.js +++ b/www/manager6/dc/CorosyncLinkEdit.js @@ -262,7 +262,7 @@ Ext.define('PVE.form.CorosyncLinkSelector', { return true; } - if (val === undefined || (val instanceof String && val.length === 0)) { + if (val === undefined || val instanceof String && val.length === 0) { // let this be caught by allowBlank, if at all return true; } diff --git a/www/manager6/dc/Health.js b/www/manager6/dc/Health.js index ec7d3497..8f4a387c 100644 --- a/www/manager6/dc/Health.js +++ b/www/manager6/dc/Health.js @@ -59,7 +59,7 @@ Ext.define('PVE.dc.Health', { } } - if (numNodes !== (nodes.online + nodes.offline)) { + if (numNodes !== nodes.online + nodes.offline) { nodes.offline = numNodes - nodes.online; } diff --git a/www/manager6/dc/NodeView.js b/www/manager6/dc/NodeView.js index f1d6ed15..838d347c 100644 --- a/www/manager6/dc/NodeView.js +++ b/www/manager6/dc/NodeView.js @@ -25,7 +25,7 @@ Ext.define('PVE.dc.NodeView', { sortable: true, dataIndex: 'online', renderer: function(value) { - var cls = (value)?'good':'critical'; + var cls = value?'good':'critical'; return ''; }, }, diff --git a/www/manager6/dc/OptionView.js b/www/manager6/dc/OptionView.js index a5232567..0e783cf4 100644 --- a/www/manager6/dc/OptionView.js +++ b/www/manager6/dc/OptionView.js @@ -12,7 +12,7 @@ Ext.define('PVE.dc.OptionView', { opts = opts || {}; me.rows = me.rows || {}; - let canEdit = (!opts.hasOwnProperty('caps') || opts.caps); + let canEdit = !opts.hasOwnProperty('caps') || opts.caps; me.rows[name] = { required: true, defaultValue: opts.defaultValue, diff --git a/www/manager6/dc/SecurityGroups.js b/www/manager6/dc/SecurityGroups.js index 289c92c9..2aecaeeb 100644 --- a/www/manager6/dc/SecurityGroups.js +++ b/www/manager6/dc/SecurityGroups.js @@ -15,7 +15,7 @@ Ext.define('PVE.SecurityGroupEdit', { initComponent: function() { var me = this; - me.isCreate = (me.group_name === undefined); + me.isCreate = me.group_name === undefined; var subject; @@ -152,7 +152,7 @@ Ext.define('PVE.SecurityGroupList', { selModel: sm, baseurl: me.base_url + '/', enableFn: function(rec) { - return (rec && me.base_url); + return rec && me.base_url; }, callback: function() { reload(); diff --git a/www/manager6/dc/Summary.js b/www/manager6/dc/Summary.js index a6acc964..5b09116b 100644 --- a/www/manager6/dc/Summary.js +++ b/www/manager6/dc/Summary.js @@ -157,7 +157,7 @@ Ext.define('PVE.dc.Summary', { var item = results[i]; switch (item.data.type) { case 'node': - cpu += (item.data.cpu * item.data.maxcpu); + cpu += item.data.cpu * item.data.maxcpu; maxcpu += item.data.maxcpu || 0; memory += item.data.mem || 0; maxmem += item.data.maxmem || 0; @@ -183,7 +183,7 @@ Ext.define('PVE.dc.Summary', { break; } if (!countedStorages[item.data.storage] || - (!item.data.shared && !countedStorages[item.data.id])) { + !item.data.shared && !countedStorages[item.data.id]) { used += item.data.disk; total += item.data.maxdisk; @@ -207,13 +207,13 @@ Ext.define('PVE.dc.Summary', { } var text = Ext.String.format(gettext('of {0} CPU(s)'), maxcpu); - cpustat.updateValue((cpu/maxcpu), text); + cpustat.updateValue(cpu/maxcpu, text); text = Ext.String.format(gettext('{0} of {1}'), PVE.Utils.render_size(memory), PVE.Utils.render_size(maxmem)); - memorystat.updateValue((memory/maxmem), text); + memorystat.updateValue(memory/maxmem, text); text = Ext.String.format(gettext('{0} of {1}'), PVE.Utils.render_size(used), PVE.Utils.render_size(total)); - storagestat.updateValue((used/total), text); + storagestat.updateValue(used/total, text); gueststatus.updateValues(qemu, lxc, error); diff --git a/www/manager6/dc/TFAEdit.js b/www/manager6/dc/TFAEdit.js index 39790823..0613ecf9 100644 --- a/www/manager6/dc/TFAEdit.js +++ b/www/manager6/dc/TFAEdit.js @@ -112,15 +112,15 @@ Ext.define('PVE.window.TFAEdit', { return get('secret').length > 0 && get('canSetupTOTP'); }, canDeleteTFA: function(get) { - return (get('tfa_type') !== null && !get('tfa_required')); + return get('tfa_type') !== null && !get('tfa_required'); }, canSetupTOTP: function(get) { var tfa = get('tfa_type'); - return (tfa === null || tfa === 'totp' || tfa === 1); + return tfa === null || tfa === 'totp' || tfa === 1; }, canSetupU2F: function(get) { var tfa = get('tfa_type'); - return (get('u2f_available') && (tfa === null || tfa === 'u2f' || tfa === 1)); + return get('u2f_available') && (tfa === null || tfa === 'u2f' || tfa === 1); }, secretEmpty: function(get) { return get('secret').length === 0; diff --git a/www/manager6/form/BridgeSelector.js b/www/manager6/form/BridgeSelector.js index 6e08741e..350588cd 100644 --- a/www/manager6/form/BridgeSelector.js +++ b/www/manager6/form/BridgeSelector.js @@ -42,7 +42,7 @@ Ext.define('PVE.form.BridgeSelector', { setNodename: function(nodename) { var me = this; - if (!nodename || (me.nodename === nodename)) { + if (!nodename || me.nodename === nodename) { return; } diff --git a/www/manager6/form/DiskStorageSelector.js b/www/manager6/form/DiskStorageSelector.js index 453dc199..cf73f2e2 100644 --- a/www/manager6/form/DiskStorageSelector.js +++ b/www/manager6/form/DiskStorageSelector.js @@ -58,7 +58,7 @@ Ext.define('PVE.form.DiskStorageSelector', { if (rec.data.format) { var format = rec.data.format[0]; // 0 is the formats, 1 the default in the backend delete format.subvol; // we never need subvol in the gui - selectformat = (Ext.Object.getSize(format) > 1); + selectformat = Ext.Object.getSize(format) > 1; } var select = !!rec.data.select_existing && !me.hideSelection; diff --git a/www/manager6/form/FileSelector.js b/www/manager6/form/FileSelector.js index 94e716d6..ef2bedf9 100644 --- a/www/manager6/form/FileSelector.js +++ b/www/manager6/form/FileSelector.js @@ -19,12 +19,12 @@ Ext.define('PVE.form.FileSelector', { var me = this; var change = false; - if (storage && (me.storage !== storage)) { + if (storage && me.storage !== storage) { me.storage = storage; change = true; } - if (nodename && (me.nodename !== nodename)) { + if (nodename && me.nodename !== nodename) { me.nodename = nodename; change = true; } diff --git a/www/manager6/form/GlobalSearchField.js b/www/manager6/form/GlobalSearchField.js index f4225d9f..5158cce5 100644 --- a/www/manager6/form/GlobalSearchField.js +++ b/www/manager6/form/GlobalSearchField.js @@ -141,7 +141,7 @@ Ext.define('PVE.form.GlobalSearchField', { } // give the row the 'relevance' value item.data.relevance = match; - return (match > 0); + return match > 0; }, updateFilter: function(field, newValue, oldValue) { diff --git a/www/manager6/form/MDevSelector.js b/www/manager6/form/MDevSelector.js index 399f7b37..8ee73c0c 100644 --- a/www/manager6/form/MDevSelector.js +++ b/www/manager6/form/MDevSelector.js @@ -45,7 +45,7 @@ Ext.define('PVE.form.MDevSelector', { setPciID: function(pciid, force) { var me = this; - if (!force && (!pciid || (me.pciid === pciid))) { + if (!force && (!pciid || me.pciid === pciid)) { return; } @@ -57,7 +57,7 @@ Ext.define('PVE.form.MDevSelector', { setNodename: function(nodename) { var me = this; - if (!nodename || (me.nodename === nodename)) { + if (!nodename || me.nodename === nodename) { return; } diff --git a/www/manager6/form/MemoryField.js b/www/manager6/form/MemoryField.js index c4d92643..10b7ff36 100644 --- a/www/manager6/form/MemoryField.js +++ b/www/manager6/form/MemoryField.js @@ -36,10 +36,10 @@ Ext.define('PVE.form.MemoryField', { var i, j; for (j = 0; j < 9; j++) { for (i = 0; i < 32; i++) { - if ((value >= current_size) && (value < (current_size + dimm_size))) { + if (value >= current_size && value < current_size + dimm_size) { value_start = current_size; value_up = current_size + dimm_size; - value_down = current_size - ((i === 0) ? prev_dimm_size : dimm_size); + value_down = current_size - (i === 0 ? prev_dimm_size : dimm_size); } current_size += dimm_size; } diff --git a/www/manager6/form/NodeSelector.js b/www/manager6/form/NodeSelector.js index 2a89d1d2..4a0f7da7 100644 --- a/www/manager6/form/NodeSelector.js +++ b/www/manager6/form/NodeSelector.js @@ -64,7 +64,7 @@ Ext.define('PVE.form.NodeSelector', { validator: function(value) { var me = this; - if (!me.onlineValidator || (me.allowBlank && !value)) { + if (!me.onlineValidator || me.allowBlank && !value) { return true; } diff --git a/www/manager6/form/PCISelector.js b/www/manager6/form/PCISelector.js index fb9f84d4..1c949a20 100644 --- a/www/manager6/form/PCISelector.js +++ b/www/manager6/form/PCISelector.js @@ -58,7 +58,7 @@ Ext.define('PVE.form.PCISelector', { setNodename: function(nodename) { var me = this; - if (!nodename || (me.nodename === nodename)) { + if (!nodename || me.nodename === nodename) { return; } diff --git a/www/manager6/form/StorageSelector.js b/www/manager6/form/StorageSelector.js index ea4a0744..60d7d741 100644 --- a/www/manager6/form/StorageSelector.js +++ b/www/manager6/form/StorageSelector.js @@ -63,7 +63,7 @@ Ext.define('PVE.form.StorageSelector', { setTargetNode: function(targetNode) { var me = this; - if (!targetNode || (me.targetNode === targetNode)) { + if (!targetNode || me.targetNode === targetNode) { return; } @@ -75,7 +75,7 @@ Ext.define('PVE.form.StorageSelector', { setNodename: function(nodename) { var me = this; - if (!nodename || (me.nodename === nodename)) { + if (!nodename || me.nodename === nodename) { return; } diff --git a/www/manager6/form/USBSelector.js b/www/manager6/form/USBSelector.js index 4fef6d34..355bc88c 100644 --- a/www/manager6/form/USBSelector.js +++ b/www/manager6/form/USBSelector.js @@ -62,7 +62,7 @@ Ext.define('PVE.form.USBSelector', { width: 520, columns: [ { - header: (me.type === 'device')?gettext('Device'):gettext('Port'), + header: me.type === 'device'?gettext('Device'):gettext('Port'), sortable: true, dataIndex: 'usbid', width: 80, diff --git a/www/manager6/form/ViewSelector.js b/www/manager6/form/ViewSelector.js index d744b319..96d2c6ed 100644 --- a/www/manager6/form/ViewSelector.js +++ b/www/manager6/form/ViewSelector.js @@ -73,7 +73,7 @@ Ext.define('PVE.form.ViewSelector', { applyState: function(state, doSelect) { var view = me.getValue(); - if (state && state.value && (view != state.value)) { + if (state && state.value && view != state.value) { var record = store.findRecord('key', state.value, 0, false, true, true); if (record) { me.setValue(state.value, true); diff --git a/www/manager6/grid/FirewallAliases.js b/www/manager6/grid/FirewallAliases.js index 0281e99d..9562abc2 100644 --- a/www/manager6/grid/FirewallAliases.js +++ b/www/manager6/grid/FirewallAliases.js @@ -10,7 +10,7 @@ Ext.define('PVE.FirewallAliasEdit', { initComponent: function() { var me = this; - me.isCreate = (me.alias_name === undefined); + me.isCreate = me.alias_name === undefined; if (me.isCreate) { me.url = '/api2/extjs' + me.base_url; diff --git a/www/manager6/grid/FirewallRules.js b/www/manager6/grid/FirewallRules.js index d0d804c9..c3b8fa53 100644 --- a/www/manager6/grid/FirewallRules.js +++ b/www/manager6/grid/FirewallRules.js @@ -245,7 +245,7 @@ Ext.define('PVE.FirewallRuleEdit', { throw "no list_refs_url specified"; } - me.isCreate = (me.rule_pos === undefined); + me.isCreate = me.rule_pos === undefined; if (me.isCreate) { me.url = '/api2/extjs' + me.base_url; @@ -301,7 +301,7 @@ Ext.define('PVE.FirewallGroupRuleEdit', { initComponent: function() { var me = this; - me.isCreate = (me.rule_pos === undefined); + me.isCreate = me.rule_pos === undefined; if (me.isCreate) { me.url = '/api2/extjs' + me.base_url; @@ -568,7 +568,7 @@ Ext.define('PVE.FirewallRules', { text: gettext('Copy'), selModel: sm, enableFn: function(rec) { - return (rec.data.type === 'in' || rec.data.type === 'out'); + return rec.data.type === 'in' || rec.data.type === 'out'; }, disabled: true, handler: run_copy_editor, diff --git a/www/manager6/grid/PoolMembers.js b/www/manager6/grid/PoolMembers.js index 4be2267c..a8ef4b80 100644 --- a/www/manager6/grid/PoolMembers.js +++ b/www/manager6/grid/PoolMembers.js @@ -30,7 +30,7 @@ Ext.define('PVE.pool.AddVM', { ], filters: [ function(item) { - return ((item.data.type === 'lxc' || item.data.type === 'qemu') && item.data.pool === ''); + return (item.data.type === 'lxc' || item.data.type === 'qemu') && item.data.pool === ''; }, ], }); diff --git a/www/manager6/grid/Replication.js b/www/manager6/grid/Replication.js index ddc80fdd..a2b7cd95 100644 --- a/www/manager6/grid/Replication.js +++ b/www/manager6/grid/Replication.js @@ -17,7 +17,7 @@ Ext.define('PVE.window.ReplicaEdit', { var items = []; items.push({ - xtype: (me.isCreate && !vmid)?'pveGuestIDSelector':'displayfield', + xtype: me.isCreate && !vmid?'pveGuestIDSelector':'displayfield', name: 'guest', fieldLabel: 'CT/VM ID', value: vmid || '', @@ -430,7 +430,7 @@ Ext.define('PVE.grid.ReplicaView', { me.rstore = Ext.create('Proxmox.data.UpdateStore', { storeid: 'pve-replica-' + me.nodename + me.vmid, - model: (mode === 'dc')? 'pve-replication' : 'pve-replication-state', + model: mode === 'dc'? 'pve-replication' : 'pve-replication-state', interval: 3000, proxy: { type: 'proxmox', diff --git a/www/manager6/ha/GroupEdit.js b/www/manager6/ha/GroupEdit.js index f1a1cc88..b061cfa0 100644 --- a/www/manager6/ha/GroupEdit.js +++ b/www/manager6/ha/GroupEdit.js @@ -104,7 +104,7 @@ Ext.define('PVE.ha.GroupInputPanel', { }, isValid: function() { var value = nodefield.getValue(); - return (value && 0 !== value.length); + return value && 0 !== value.length; }, }); diff --git a/www/manager6/ha/ResourceEdit.js b/www/manager6/ha/ResourceEdit.js index 8aaf49dc..c1388ce5 100644 --- a/www/manager6/ha/ResourceEdit.js +++ b/www/manager6/ha/ResourceEdit.js @@ -58,7 +58,7 @@ Ext.define('PVE.ha.VMResourceInputPanel', { }, }); - var vmidStore = (me.vmid) ? {} : { + var vmidStore = me.vmid ? {} : { model: 'PVEResources', autoLoad: true, sorters: 'vmid', @@ -80,7 +80,7 @@ Ext.define('PVE.ha.VMResourceInputPanel', { xtype: me.vmid ? 'displayfield' : 'vmComboSelector', submitValue: me.isCreate, name: 'vmid', - fieldLabel: (me.vmid && me.guestType === 'ct') ? 'CT' : 'VM', + fieldLabel: me.vmid && me.guestType === 'ct' ? 'CT' : 'VM', value: me.vmid, store: vmidStore, validateExists: true, diff --git a/www/manager6/ha/Status.js b/www/manager6/ha/Status.js index 08515710..8870faf4 100644 --- a/www/manager6/ha/Status.js +++ b/www/manager6/ha/Status.js @@ -14,7 +14,7 @@ Ext.define('PVE.ha.Status', { me.rstore = Ext.create('Proxmox.data.ObjectStore', { interval: me.interval, model: 'pve-ha-status', - storeid: 'pve-store-' + (++Ext.idSeed), + storeid: 'pve-store-' + ++Ext.idSeed, groupField: 'type', proxy: { type: 'proxmox', diff --git a/www/manager6/ha/StatusView.js b/www/manager6/ha/StatusView.js index c9c52bc4..1ccc670f 100644 --- a/www/manager6/ha/StatusView.js +++ b/www/manager6/ha/StatusView.js @@ -27,7 +27,7 @@ Ext.define('PVE.ha.StatusView', { sorterFn: function(rec1, rec2) { var p1 = me.sortPriority[rec1.data.type]; var p2 = me.sortPriority[rec2.data.type]; - return (p1 !== p2) ? ((p1 > p2) ? 1 : -1) : 0; + return p1 !== p2 ? p1 > p2 ? 1 : -1 : 0; }, }], filters: { diff --git a/www/manager6/lxc/Config.js b/www/manager6/lxc/Config.js index 1d405cf2..c0eb75be 100644 --- a/www/manager6/lxc/Config.js +++ b/www/manager6/lxc/Config.js @@ -141,7 +141,7 @@ Ext.define('PVE.lxc.Config', { Ext.create('PVE.ha.VMResourceEdit', { vmid: vmid, guestType: 'ct', - isCreate: (!ha || ha === 'unmanaged'), + isCreate: !ha || ha === 'unmanaged', }).show(); }, }, diff --git a/www/manager6/lxc/FeaturesEdit.js b/www/manager6/lxc/FeaturesEdit.js index 042d32a6..1c2795b9 100644 --- a/www/manager6/lxc/FeaturesEdit.js +++ b/www/manager6/lxc/FeaturesEdit.js @@ -14,10 +14,10 @@ Ext.define('PVE.lxc.FeaturesInputPanel', { }, formulas: { privilegedOnly: function(get) { - return (get('unprivileged') ? gettext('privileged only') : ''); + return get('unprivileged') ? gettext('privileged only') : ''; }, unprivilegedOnly: function(get) { - return (!get('unprivileged') ? gettext('unprivileged only') : ''); + return !get('unprivileged') ? gettext('unprivileged only') : ''; }, }, }, diff --git a/www/manager6/lxc/Network.js b/www/manager6/lxc/Network.js index a52f3ec4..81f9c076 100644 --- a/www/manager6/lxc/Network.js +++ b/www/manager6/lxc/Network.js @@ -9,7 +9,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', { setNodename: function(nodename) { var me = this; - if (!nodename || (me.nodename === nodename)) { + if (!nodename || me.nodename === nodename) { return; } @@ -56,7 +56,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', { cdata.name = 'eth0'; me.dataCache = {}; } - cdata.firewall = (me.insideWizard || me.isCreate); + cdata.firewall = me.insideWizard || me.isCreate; if (!me.dataCache) { throw "no dataCache specified"; @@ -155,14 +155,14 @@ Ext.define('PVE.lxc.NetworkInputPanel', { }, ]; - var dhcp4 = (cdata.ip === 'dhcp'); + var dhcp4 = cdata.ip === 'dhcp'; if (dhcp4) { cdata.ip = ''; cdata.gw = ''; } - var auto6 = (cdata.ip6 === 'auto'); - var dhcp6 = (cdata.ip6 === 'dhcp'); + var auto6 = cdata.ip6 === 'auto'; + var dhcp6 = cdata.ip6 === 'dhcp'; if (auto6 || dhcp6) { cdata.ip6 = ''; cdata.gw6 = ''; @@ -284,7 +284,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', { value: cdata.ip6, emptyText: dhcp6 || auto6 ? '' : Proxmox.Utils.NoneText, vtype: 'IP6CIDRAddress', - disabled: (dhcp6 || auto6), + disabled: dhcp6 || auto6, fieldLabel: 'IPv6/CIDR', // do not localize }, { @@ -292,7 +292,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', { name: 'gw6', vtype: 'IP6Address', value: cdata.gw6, - disabled: (dhcp6 || auto6), + disabled: dhcp6 || auto6, fieldLabel: gettext('Gateway') + ' (IPv6)', }, ]; @@ -370,7 +370,7 @@ Ext.define('PVE.lxc.NetworkView', { records.push(net); }); me.store.loadData(records); - me.down('button[name=addButton]').setDisabled((records.length >= 32)); + me.down('button[name=addButton]').setDisabled(records.length >= 32); }, }); }, diff --git a/www/manager6/lxc/Resources.js b/www/manager6/lxc/Resources.js index e58860a5..2135d21f 100644 --- a/www/manager6/lxc/Resources.js +++ b/www/manager6/lxc/Resources.js @@ -231,7 +231,7 @@ Ext.define('PVE.lxc.RessourceView', { var rowdef = rows[key]; var pending = rec.data['delete'] || me.hasPendingChanges(key); - var isDisk = (rowdef.tdCls == 'pve-itype-icon-storage'); + var isDisk = rowdef.tdCls == 'pve-itype-icon-storage'; var isUnusedDisk = key.match(/^unused\d+/); var noedit = rec.data['delete'] || !rowdef.editor; @@ -257,11 +257,11 @@ Ext.define('PVE.lxc.RessourceView', { var order1 = rows[v1].order || 0; var order2 = rows[v2].order || 0; - if ((g1 - g2) !== 0) { + if (g1 - g2 !== 0) { return g1 - g2; } - if ((order1 - order2) !== 0) { + if (order1 - order2 !== 0) { return order1 - order2; } diff --git a/www/manager6/node/LVM.js b/www/manager6/node/LVM.js index a778d135..9e7732d3 100644 --- a/www/manager6/node/LVM.js +++ b/www/manager6/node/LVM.js @@ -164,7 +164,7 @@ Ext.define('PVE.node.LVMList', { name: 'iconCls', calculate: function(data) { var txt = 'fa x-fa-tree fa-'; - txt += (data.leaf) ? 'hdd-o' : 'object-group'; + txt += data.leaf ? 'hdd-o' : 'object-group'; return txt; }, }, @@ -172,7 +172,7 @@ Ext.define('PVE.node.LVMList', { type: 'number', name: 'usage', calculate: function(data) { - return ((data.size-data.free)/data.size); + return (data.size-data.free)/data.size; }, }, ], diff --git a/www/manager6/node/ZFS.js b/www/manager6/node/ZFS.js index 8ca6776f..b54fb4e7 100644 --- a/www/manager6/node/ZFS.js +++ b/www/manager6/node/ZFS.js @@ -27,7 +27,7 @@ Ext.define('PVE.node.CreateZFS', { disks.sort(function(a, b) { var aorder = a.get('order') || 0; var border = b.get('order') || 0; - return (aorder - border); + return aorder - border; }); disks.forEach(function(disk) { diff --git a/www/manager6/panel/ConfigPanel.js b/www/manager6/panel/ConfigPanel.js index 9f1c373b..23a6ee58 100644 --- a/www/manager6/panel/ConfigPanel.js +++ b/www/manager6/panel/ConfigPanel.js @@ -254,12 +254,12 @@ Ext.define('PVE.panel.Config', { // select the new item var statechange = function(sp, key, state) { // it the state change is for this panel - if (stateid && (key === stateid) && state) { + if (stateid && key === stateid && state) { // get active item var acard = me.getLayout().getActiveItem().itemId; // get the itemid of the new value var ncard = state.value || me.firstItem; - if (ncard && (acard != ncard)) { + if (ncard && acard != ncard) { // select the chosen item menu.setSelection(root.findChild('id', ncard, true) || root.firstChild); } diff --git a/www/manager6/panel/IPSet.js b/www/manager6/panel/IPSet.js index 8cb387c0..303e518a 100644 --- a/www/manager6/panel/IPSet.js +++ b/www/manager6/panel/IPSet.js @@ -168,7 +168,7 @@ Ext.define('PVE.IPSetCidrEdit', { initComponent: function() { var me = this; - me.isCreate = (me.cidr === undefined); + me.isCreate = me.cidr === undefined; if (me.isCreate) { diff --git a/www/manager6/panel/RunningChart.js b/www/manager6/panel/RunningChart.js index f6c9109d..ab4c9039 100644 --- a/www/manager6/panel/RunningChart.js +++ b/www/manager6/panel/RunningChart.js @@ -103,7 +103,7 @@ Ext.define('PVE.widget.RunningChart', { let me = this.chart; let panel = me.up(); let now = new Date().getTime(); - let begin = new Date(now - (1000 * panel.timeFrame)).getTime(); + let begin = new Date(now - 1000 * panel.timeFrame).getTime(); me.store.add({ time: time || now, diff --git a/www/manager6/panel/StatusPanel.js b/www/manager6/panel/StatusPanel.js index 12a76042..f7bb4a91 100644 --- a/www/manager6/panel/StatusPanel.js +++ b/www/manager6/panel/StatusPanel.js @@ -50,7 +50,7 @@ Ext.define('PVE.panel.StatusPanel', { if (key === stateid) { var atab = me.getActiveTab().itemId; var ntab = state.value; - if (state && ntab && (atab != ntab)) { + if (state && ntab && atab != ntab) { me.setActiveTab(ntab); } } diff --git a/www/manager6/qemu/AgentIPView.js b/www/manager6/qemu/AgentIPView.js index c3b1f89f..fd75437f 100644 --- a/www/manager6/qemu/AgentIPView.js +++ b/www/manager6/qemu/AgentIPView.js @@ -125,8 +125,8 @@ Ext.define('PVE.qemu.AgentIPView', { let agentRec = store.getById('agent'); let state = store.getById('status'); - me.agent = (agentRec && agentRec.data.value === 1); - me.running = (state && state.data.value === 'running'); + me.agent = agentRec && agentRec.data.value === 1; + me.running = state && state.data.value === 'running'; var caps = Ext.state.Manager.get('GuiCap'); diff --git a/www/manager6/qemu/BootOrderEdit.js b/www/manager6/qemu/BootOrderEdit.js index de80c7e1..73c28946 100644 --- a/www/manager6/qemu/BootOrderEdit.js +++ b/www/manager6/qemu/BootOrderEdit.js @@ -28,10 +28,10 @@ Ext.define('PVE.qemu.BootOrderPanel', { }, isBootdev: function(dev, value) { - return (this.isDisk(dev) && !this.isCloudinit(value)) || + return this.isDisk(dev) && !this.isCloudinit(value) || (/^net\d+/).test(dev) || (/^hostpci\d+/).test(dev) || - ((/^usb\d+/).test(dev) && !(/spice/).test(value)); + (/^usb\d+/).test(dev) && !(/spice/).test(value); }, setVMConfig: function(vmconfig) { diff --git a/www/manager6/qemu/CDEdit.js b/www/manager6/qemu/CDEdit.js index 091fa50b..72c01037 100644 --- a/www/manager6/qemu/CDEdit.js +++ b/www/manager6/qemu/CDEdit.js @@ -7,7 +7,7 @@ Ext.define('PVE.qemu.CDInputPanel', { onGetValues: function(values) { var me = this; - var confid = me.confid || (values.controller + values.deviceid); + var confid = me.confid || values.controller + values.deviceid; me.drive.media = 'cdrom'; if (values.mediaType === 'iso') { diff --git a/www/manager6/qemu/Config.js b/www/manager6/qemu/Config.js index 49189489..c9b7637b 100644 --- a/www/manager6/qemu/Config.js +++ b/www/manager6/qemu/Config.js @@ -116,7 +116,7 @@ Ext.define('PVE.qemu.Config', { var ha = vm.hastate; Ext.create('PVE.ha.VMResourceEdit', { vmid: vmid, - isCreate: (!ha || ha === 'unmanaged'), + isCreate: !ha || ha === 'unmanaged', }).show(); }, }, @@ -397,7 +397,7 @@ Ext.define('PVE.qemu.Config', { return; } - var resume = (['prelaunch', 'paused', 'suspended'].indexOf(qmpstatus) !== -1); + var resume = ['prelaunch', 'paused', 'suspended'].indexOf(qmpstatus) !== -1; if (resume || lock === 'suspended') { startBtn.setVisible(false); diff --git a/www/manager6/qemu/HDEdit.js b/www/manager6/qemu/HDEdit.js index d0723c05..e22111bf 100644 --- a/www/manager6/qemu/HDEdit.js +++ b/www/manager6/qemu/HDEdit.js @@ -62,7 +62,7 @@ Ext.define('PVE.qemu.HDInputPanel', { var me = this; var params = {}; - var confid = me.confid || (values.controller + values.deviceid); + var confid = me.confid || values.controller + values.deviceid; if (me.unused) { me.drive.file = me.vmconfig[values.unusedId]; @@ -133,7 +133,7 @@ Ext.define('PVE.qemu.HDInputPanel', { values.noreplicate = !PVE.Parser.parseBoolean(drive.replicate, 1); values.diskformat = drive.format || 'raw'; values.cache = drive.cache || '__default__'; - values.discard = (drive.discard === 'on'); + values.discard = drive.discard === 'on'; values.ssd = PVE.Parser.parseBoolean(drive.ssd); values.iothread = PVE.Parser.parseBoolean(drive.iothread); diff --git a/www/manager6/qemu/HDMove.js b/www/manager6/qemu/HDMove.js index 1047ce5c..6cb1552c 100644 --- a/www/manager6/qemu/HDMove.js +++ b/www/manager6/qemu/HDMove.js @@ -6,7 +6,7 @@ Ext.define('PVE.window.HDMove', { move_disk: function(disk, storage, format, delete_disk) { var me = this; - var qemu = (me.type === 'qemu'); + var qemu = me.type === 'qemu'; var params = {}; params.storage = storage; params[qemu ? 'disk':'volume'] = disk; @@ -58,7 +58,7 @@ Ext.define('PVE.window.HDMove', { me.type = 'qemu'; } - var qemu = (me.type === 'qemu'); + var qemu = me.type === 'qemu'; var items = [ { diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js index 5440a049..a2e20840 100644 --- a/www/manager6/qemu/HardwareView.js +++ b/www/manager6/qemu/HardwareView.js @@ -10,7 +10,7 @@ Ext.define('PVE.qemu.HardwareView', { var rowdef = rows[key] || {}; var iconCls = rowdef.iconCls; var icon = ''; - var txt = (rowdef.header || key); + var txt = rowdef.header || key; metaData.tdAttr = "valign=middle"; @@ -93,7 +93,7 @@ Ext.define('PVE.qemu.HardwareView', { sockets: { header: gettext('Processors'), never_delete: true, - editor: (caps.vms['VM.Config.CPU'] || caps.vms['VM.Config.HWType']) + editor: caps.vms['VM.Config.CPU'] || caps.vms['VM.Config.HWType'] ? 'PVE.qemu.ProcessorEdit' : undefined, tdCls: 'pve-itype-icon-processor', group: 3, @@ -315,11 +315,11 @@ Ext.define('PVE.qemu.HardwareView', { var order1 = rows[v1].order || 0; var order2 = rows[v2].order || 0; - if ((g1 - g2) !== 0) { + if (g1 - g2 !== 0) { return g1 - g2; } - if ((order1 - order2) !== 0) { + if (order1 - order2 !== 0) { return order1 - order2; } @@ -528,7 +528,7 @@ Ext.define('PVE.qemu.HardwareView', { }); let counts = {}; - let isAtLimit = (type) => (counts[type] >= PVE.Utils.hardware_counts[type]); + let isAtLimit = (type) => counts[type] >= PVE.Utils.hardware_counts[type]; var set_button_status = function() { var sm = me.getSelectionModel(); @@ -585,19 +585,19 @@ Ext.define('PVE.qemu.HardwareView', { var rowdef = rows[key]; var pending = rec.data['delete'] || me.hasPendingChanges(key); - var isCDRom = (value && !!value.toString().match(/media=cdrom/)); + var isCDRom = value && !!value.toString().match(/media=cdrom/); var isUnusedDisk = key.match(/^unused\d+/); var isUsedDisk = !isUnusedDisk && rowdef.isOnStorageBus && !isCDRom; - var isCloudInit = (value && value.toString().match(/vm-.*-cloudinit/)); + var isCloudInit = value && value.toString().match(/vm-.*-cloudinit/); - var isEfi = (key === 'efidisk0'); + var isEfi = key === 'efidisk0'; - remove_btn.setDisabled(rec.data['delete'] || (rowdef.never_delete === true) || (isUnusedDisk && !diskCap)); - remove_btn.setText((isUsedDisk && !isCloudInit) ? remove_btn.altText : remove_btn.defaultText); + remove_btn.setDisabled(rec.data['delete'] || rowdef.never_delete === true || isUnusedDisk && !diskCap); + remove_btn.setText(isUsedDisk && !isCloudInit ? remove_btn.altText : remove_btn.defaultText); remove_btn.RESTMethod = isUnusedDisk ? 'POST':'PUT'; - edit_btn.setDisabled(rec.data['delete'] || !rowdef.editor || isCloudInit || (!isCDRom && !diskCap)); + edit_btn.setDisabled(rec.data['delete'] || !rowdef.editor || isCloudInit || !isCDRom && !diskCap); resize_btn.setDisabled(pending || !isUsedDisk || !diskCap); diff --git a/www/manager6/qemu/MemoryEdit.js b/www/manager6/qemu/MemoryEdit.js index b4ea127b..63c1294f 100644 --- a/www/manager6/qemu/MemoryEdit.js +++ b/www/manager6/qemu/MemoryEdit.js @@ -19,7 +19,7 @@ Ext.define('PVE.qemu.MemoryInputPanel', { } else if (values.memory === values.balloon) { delete res.balloon; res['delete'] = 'balloon,shares'; - } else if (Ext.isDefined(values.shares) && (values.shares !== "")) { + } else if (Ext.isDefined(values.shares) && values.shares !== "") { res.shares = values.shares; } else { res['delete'] = "shares"; @@ -102,7 +102,7 @@ Ext.define('PVE.qemu.MemoryInputPanel', { var shares = me.down('field[name=shares]'); var memory = me.down('field[name=memory]'); bf.setDisabled(!value); - shares.setDisabled(!value || (bf.getValue() === memory.getValue())); + shares.setDisabled(!value || bf.getValue() === memory.getValue()); }, }, }, @@ -156,7 +156,7 @@ Ext.define('PVE.qemu.MemoryEdit', { ballooning: data.balloon === 0 ? '0' : '1', shares: data.shares, memory: data.memory || '512', - balloon: data.balloon > 0 ? data.balloon : (data.memory || '512'), + balloon: data.balloon > 0 ? data.balloon : data.memory || '512', }; ipanel.setValues(values); diff --git a/www/manager6/qemu/NetworkEdit.js b/www/manager6/qemu/NetworkEdit.js index 9500b53d..b39cffdc 100644 --- a/www/manager6/qemu/NetworkEdit.js +++ b/www/manager6/qemu/NetworkEdit.js @@ -83,7 +83,7 @@ Ext.define('PVE.qemu.NetworkInputPanel', { xtype: 'proxmoxcheckbox', fieldLabel: gettext('Firewall'), name: 'firewall', - checked: (me.insideWizard || me.isCreate), + checked: me.insideWizard || me.isCreate, }, ]; diff --git a/www/manager6/qemu/OSDefaults.js b/www/manager6/qemu/OSDefaults.js index 4af0f5c4..8e585651 100644 --- a/www/manager6/qemu/OSDefaults.js +++ b/www/manager6/qemu/OSDefaults.js @@ -28,7 +28,7 @@ Ext.define('PVE.qemu.OSDefaults', { var child = Ext.clone(me[settings.parent]); me[settings.pveOS] = Ext.apply(child, settings); } else { - throw ("Could not find your genitor"); + throw "Could not find your genitor"; } }; diff --git a/www/manager6/sdn/Status.js b/www/manager6/sdn/Status.js index 2ad02809..858d09bd 100644 --- a/www/manager6/sdn/Status.js +++ b/www/manager6/sdn/Status.js @@ -15,7 +15,7 @@ Ext.define('PVE.sdn.Status', { me.rstore = Ext.create('Proxmox.data.ObjectStore', { interval: me.interval, model: 'pve-sdn-status', - storeid: 'pve-store-' + (++Ext.idSeed), + storeid: 'pve-store-' + ++Ext.idSeed, groupField: 'type', proxy: { type: 'proxmox', diff --git a/www/manager6/sdn/StatusView.js b/www/manager6/sdn/StatusView.js index 58dc8d2b..970aa919 100644 --- a/www/manager6/sdn/StatusView.js +++ b/www/manager6/sdn/StatusView.js @@ -24,7 +24,7 @@ Ext.define('PVE.sdn.StatusView', { sorterFn: function(rec1, rec2) { var p1 = me.sortPriority[rec1.data.type]; var p2 = me.sortPriority[rec2.data.type]; - return (p1 !== p2) ? ((p1 > p2) ? 1 : -1) : 0; + return p1 !== p2 ? p1 > p2 ? 1 : -1 : 0; }, }], filters: { diff --git a/www/manager6/storage/IScsiEdit.js b/www/manager6/storage/IScsiEdit.js index 4cb6bec5..c5afa53b 100644 --- a/www/manager6/storage/IScsiEdit.js +++ b/www/manager6/storage/IScsiEdit.js @@ -71,7 +71,7 @@ Ext.define('PVE.storage.IScsiInputPanel', { }, setValues: function(values) { - values.luns = (values.content.indexOf('images') !== -1); + values.luns = values.content.indexOf('images') !== -1; this.callParent([values]); }, diff --git a/www/manager6/storage/ImageView.js b/www/manager6/storage/ImageView.js index e2a6b715..c828116d 100644 --- a/www/manager6/storage/ImageView.js +++ b/www/manager6/storage/ImageView.js @@ -16,7 +16,7 @@ Ext.define('PVE.storage.ImageView', { throw "no storage ID specified"; } - if (!me.content || (me.content !== 'images' && me.content !== 'rootdir')) { + if (!me.content || me.content !== 'images' && me.content !== 'rootdir') { throw "content needs to be either 'images' or 'rootdir'"; } diff --git a/www/manager6/storage/TemplateView.js b/www/manager6/storage/TemplateView.js index c5fda247..8230774d 100644 --- a/www/manager6/storage/TemplateView.js +++ b/www/manager6/storage/TemplateView.js @@ -53,8 +53,8 @@ Ext.define('PVE.grid.TemplateSelector', { var value = field.getValue().toLowerCase(); store.clearFilter(true); store.filterBy(function(rec) { - return (rec.data['package'].toLowerCase().indexOf(value) !== -1) || - (rec.data.headline.toLowerCase().indexOf(value) !== -1); + return rec.data['package'].toLowerCase().indexOf(value) !== -1 || + rec.data.headline.toLowerCase().indexOf(value) !== -1; }); }, }, diff --git a/www/manager6/tree/ResourceTree.js b/www/manager6/tree/ResourceTree.js index cac8aae4..0b76ae1a 100644 --- a/www/manager6/tree/ResourceTree.js +++ b/www/manager6/tree/ResourceTree.js @@ -45,14 +45,14 @@ Ext.define('PVE.tree.ResourceTree', { var n1 = node1.data; var n2 = node2.data; - if ((n1.groupbyid && n2.groupbyid) || + if (n1.groupbyid && n2.groupbyid || !(n1.groupbyid || n2.groupbyid)) { var tcmp; var v1 = n1.type; var v2 = n2.type; - if ((tcmp = v1 > v2 ? 1 : (v1 < v2 ? -1 : 0)) != 0) { + if ((tcmp = v1 > v2 ? 1 : v1 < v2 ? -1 : 0) != 0) { return tcmp; } @@ -66,12 +66,12 @@ Ext.define('PVE.tree.ResourceTree', { } v1 = n1.vmid; v2 = n2.vmid; - if ((tcmp = v1 > v2 ? 1 : (v1 < v2 ? -1 : 0)) != 0) { + if ((tcmp = v1 > v2 ? 1 : v1 < v2 ? -1 : 0) != 0) { return tcmp; } } - return n1.id > n2.id ? 1 : (n1.id < n2.id ? -1 : 0); + return n1.id > n2.id ? 1 : n1.id < n2.id ? -1 : 0; } else if (n1.groupbyid) { return -1; } else if (n2.groupbyid) { @@ -422,7 +422,7 @@ Ext.define('PVE.tree.ResourceTree', { var sm = me.getSelectionModel(); // disable selection when right clicking // except the record is already selected - me.allowSelection = (ev.button !== 2) || sm.isSelected(record); + me.allowSelection = ev.button !== 2 || sm.isSelected(record); }, beforeselect: function(tree, record, index, eopts) { var allow = me.allowSelection; diff --git a/www/manager6/window/Backup.js b/www/manager6/window/Backup.js index f3990633..615073f3 100644 --- a/www/manager6/window/Backup.js +++ b/www/manager6/window/Backup.js @@ -128,7 +128,7 @@ Ext.define('PVE.window.Backup', { }); var title = gettext('Backup') + " " + - ((me.vmtype === 'lxc') ? "CT" : "VM") + + (me.vmtype === 'lxc' ? "CT" : "VM") + " " + me.vmid; Ext.apply(me, { diff --git a/www/manager6/window/BulkAction.js b/www/manager6/window/BulkAction.js index de8ef255..135f570f 100644 --- a/www/manager6/window/BulkAction.js +++ b/www/manager6/window/BulkAction.js @@ -133,8 +133,8 @@ Ext.define('PVE.window.BulkAction', { selectionchange: function(vmselector, records) { if (me.action == 'migrateall') { var showWarning = records.some(function(item) { - return (item.data.type == 'lxc' && - item.data.status == 'running'); + return item.data.type == 'lxc' && + item.data.status == 'running'; }); me.down('#lxcwarning').setVisible(showWarning); } diff --git a/www/manager6/window/Restore.js b/www/manager6/window/Restore.js index dac883f1..d220c7bf 100644 --- a/www/manager6/window/Restore.js +++ b/www/manager6/window/Restore.js @@ -23,11 +23,11 @@ Ext.define('PVE.window.Restore', { name: 'storage', value: '', fieldLabel: gettext('Storage'), - storageContent: (me.vmtype === 'lxc') ? 'rootdir' : 'images', + storageContent: me.vmtype === 'lxc' ? 'rootdir' : 'images', // when restoring a container without specifying a storage, the backend defaults // to 'local', which is unintuitive and 'rootdir' might not even be allowed on it allowBlank: me.vmtype !== 'lxc', - emptyText: (me.vmtype === 'lxc') ? '' : gettext('From backup configuration'), + emptyText: me.vmtype === 'lxc' ? '' : gettext('From backup configuration'), autoSelect: me.vmtype === 'lxc', }); @@ -36,7 +36,7 @@ Ext.define('PVE.window.Restore', { IDfield = Ext.create('Ext.form.field.Display', { name: 'vmid', value: me.vmid, - fieldLabel: (me.vmtype === 'lxc') ? 'CT' : 'VM', + fieldLabel: me.vmtype === 'lxc' ? 'CT' : 'VM', }); } else { IDfield = Ext.create('PVE.form.GuestIDSelector', { @@ -186,7 +186,7 @@ Ext.define('PVE.window.Restore', { }); var title = gettext('Restore') + ": " + ( - (me.vmtype === 'lxc') ? 'CT' : 'VM'); + me.vmtype === 'lxc' ? 'CT' : 'VM'); if (me.vmid) { title += " " + me.vmid;