From 8058410f40568d46d323cd6ad3b17c3327789594 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 19 Jan 2021 17:39:15 +0100 Subject: [PATCH] ui: eslint: fix various spacing related issues Signed-off-by: Thomas Lamprecht --- www/manager6/Parser.js | 20 +++-- www/manager6/StateProvider.js | 12 +-- www/manager6/Utils.js | 88 +++++++++------------ www/manager6/VNCConsole.js | 2 +- www/manager6/Workspace.js | 20 +++-- www/manager6/button/ConsoleButton.js | 6 +- www/manager6/button/Revert.js | 2 +- www/manager6/button/Split.js | 4 +- www/manager6/ceph/CephInstallWizard.js | 14 ++-- www/manager6/ceph/Config.js | 5 +- www/manager6/ceph/Crush.js | 4 +- www/manager6/ceph/FS.js | 10 +-- www/manager6/ceph/Log.js | 4 +- www/manager6/ceph/Monitor.js | 2 +- www/manager6/ceph/Pool.js | 33 ++++---- www/manager6/ceph/ServiceList.js | 17 ++-- www/manager6/ceph/Services.js | 6 +- www/manager6/ceph/Status.js | 6 +- www/manager6/ceph/StatusDetail.js | 6 +- www/manager6/data/ResourceStore.js | 4 +- www/manager6/data/model/RRDModels.js | 6 +- www/manager6/dc/ACLView.js | 11 +-- www/manager6/dc/Backup.js | 41 +++++----- www/manager6/dc/Cluster.js | 2 +- www/manager6/dc/ClusterEdit.js | 1 - www/manager6/dc/CorosyncLinkEdit.js | 6 +- www/manager6/dc/GroupEdit.js | 2 +- www/manager6/dc/GroupView.js | 2 +- www/manager6/dc/Guests.js | 6 +- www/manager6/dc/Health.js | 7 +- www/manager6/dc/Log.js | 2 +- www/manager6/dc/NodeView.js | 12 ++- www/manager6/dc/OptionView.js | 4 +- www/manager6/dc/PoolView.js | 4 +- www/manager6/dc/RoleEdit.js | 2 +- www/manager6/dc/RoleView.js | 3 +- www/manager6/dc/SecurityGroups.js | 10 +-- www/manager6/dc/StorageView.js | 10 +-- www/manager6/dc/Summary.js | 8 +- www/manager6/dc/Tasks.js | 12 +-- www/manager6/dc/UserEdit.js | 9 +-- www/manager6/dc/UserView.js | 2 +- www/manager6/form/BandwidthSelector.js | 6 +- www/manager6/form/BridgeSelector.js | 4 +- www/manager6/form/CPUModelSelector.js | 8 +- www/manager6/form/CalendarEvent.js | 12 +-- www/manager6/form/CephPoolSelector.js | 2 +- www/manager6/form/ControllerSelector.js | 2 +- www/manager6/form/DayOfWeekSelector.js | 4 +- www/manager6/form/DiskFormatSelector.js | 2 +- www/manager6/form/FirewallPolicySelector.js | 2 +- www/manager6/form/GlobalSearchField.js | 16 ++-- www/manager6/form/GroupSelector.js | 2 +- www/manager6/form/HotplugFeatureSelector.js | 4 +- www/manager6/form/IPProtocolSelector.js | 4 +- www/manager6/form/IPRefSelector.js | 2 +- www/manager6/form/MDevSelector.js | 4 +- www/manager6/form/NodeSelector.js | 8 +- www/manager6/form/PCISelector.js | 4 +- www/manager6/form/PoolSelector.js | 4 +- www/manager6/form/PrivilegesSelector.js | 2 +- www/manager6/form/SDNControllerSelector.js | 4 +- www/manager6/form/SDNZoneSelector.js | 4 +- www/manager6/form/SecurityGroupSelector.js | 2 +- www/manager6/form/SnapshotSelector.js | 2 +- www/manager6/form/StorageSelector.js | 5 +- www/manager6/form/USBSelector.js | 11 ++- www/manager6/form/UserSelector.js | 4 +- www/manager6/form/VMCPUFlagSelector.js | 4 +- www/manager6/form/VMSelector.js | 16 ++-- www/manager6/form/ViewSelector.js | 4 +- www/manager6/form/iScsiProviderSelector.js | 6 +- www/manager6/grid/BackupView.js | 4 +- www/manager6/grid/FirewallAliases.js | 18 ++--- www/manager6/grid/FirewallOptions.js | 5 +- www/manager6/grid/FirewallRules.js | 30 +++---- www/manager6/grid/PoolMembers.js | 18 ++--- www/manager6/grid/Replication.js | 8 +- www/manager6/grid/ResourceGrid.js | 5 +- www/manager6/ha/Fencing.js | 4 +- www/manager6/ha/GroupEdit.js | 21 +++-- www/manager6/ha/GroupSelector.js | 5 +- www/manager6/ha/Groups.js | 2 +- www/manager6/ha/ResourceEdit.js | 13 ++- www/manager6/ha/Resources.js | 6 +- www/manager6/ha/StatusView.js | 5 +- www/manager6/lxc/Config.js | 10 ++- www/manager6/lxc/CreateWizard.js | 9 +-- www/manager6/lxc/DNS.js | 16 ++-- www/manager6/lxc/MPEdit.js | 6 +- www/manager6/lxc/MPResize.js | 9 +-- www/manager6/lxc/Network.js | 24 +++--- www/manager6/lxc/Options.js | 13 ++- www/manager6/lxc/ResourceEdit.js | 6 +- www/manager6/lxc/Resources.js | 5 +- www/manager6/node/Certificates.js | 6 +- www/manager6/node/Directory.js | 4 +- www/manager6/node/LVM.js | 2 +- www/manager6/node/LVMThin.js | 2 +- www/manager6/node/StatusView.js | 6 +- www/manager6/node/Summary.js | 6 +- www/manager6/node/ZFS.js | 5 +- www/manager6/panel/ConfigPanel.js | 12 +-- www/manager6/panel/GuestStatusView.js | 2 +- www/manager6/panel/GuestSummary.js | 4 +- www/manager6/panel/HealthWidget.js | 4 +- www/manager6/panel/IPSet.js | 25 +++--- www/manager6/panel/InfoWidget.js | 2 +- www/manager6/panel/NotesView.js | 2 +- www/manager6/panel/RunningChart.js | 8 +- www/manager6/panel/StatusPanel.js | 1 - www/manager6/panel/StatusView.js | 4 +- www/manager6/pool/StatusView.js | 2 +- www/manager6/pool/Summary.js | 2 +- www/manager6/qemu/AgentIPView.js | 3 +- www/manager6/qemu/AudioEdit.js | 2 +- www/manager6/qemu/CDEdit.js | 10 +-- www/manager6/qemu/CIDriveEdit.js | 4 +- www/manager6/qemu/CloudInit.js | 6 +- www/manager6/qemu/Config.js | 9 ++- www/manager6/qemu/CreateWizard.js | 12 +-- www/manager6/qemu/DisplayEdit.js | 2 +- www/manager6/qemu/HDEdit.js | 10 +-- www/manager6/qemu/HDEfi.js | 4 +- www/manager6/qemu/HDMove.js | 7 +- www/manager6/qemu/HDResize.js | 9 +-- www/manager6/qemu/HardwareView.js | 23 +++--- www/manager6/qemu/IPConfigEdit.js | 5 +- www/manager6/qemu/KeyboardEdit.js | 2 +- www/manager6/qemu/MemoryEdit.js | 4 +- www/manager6/qemu/Monitor.js | 4 +- www/manager6/qemu/NetworkEdit.js | 5 +- www/manager6/qemu/OSDefaults.js | 9 +-- www/manager6/qemu/OSTypeEdit.js | 8 +- www/manager6/qemu/Options.js | 16 ++-- www/manager6/qemu/PCIEdit.js | 11 ++- www/manager6/qemu/ProcessorEdit.js | 5 +- www/manager6/qemu/RNGEdit.js | 2 +- www/manager6/qemu/SSHKey.js | 5 +- www/manager6/qemu/ScsiHwEdit.js | 2 +- www/manager6/qemu/SerialEdit.js | 7 +- www/manager6/qemu/Smbios1Edit.js | 3 +- www/manager6/qemu/USBEdit.js | 8 +- www/manager6/sdn/ControllerView.js | 4 +- www/manager6/sdn/StatusView.js | 5 +- www/manager6/sdn/VnetView.js | 4 +- www/manager6/sdn/ZoneContentView.js | 5 +- www/manager6/sdn/ZoneView.js | 4 +- www/manager6/sdn/controllers/Base.js | 6 +- www/manager6/sdn/controllers/EvpnEdit.js | 2 +- www/manager6/sdn/zones/Base.js | 8 +- www/manager6/sdn/zones/EvpnEdit.js | 2 +- www/manager6/sdn/zones/QinQEdit.js | 2 +- www/manager6/sdn/zones/SimpleEdit.js | 2 +- www/manager6/sdn/zones/VlanEdit.js | 2 +- www/manager6/sdn/zones/VxlanEdit.js | 2 +- www/manager6/storage/Base.js | 8 +- www/manager6/storage/CephFSEdit.js | 6 +- www/manager6/storage/DirEdit.js | 2 +- www/manager6/storage/GlusterFsEdit.js | 6 +- www/manager6/storage/IScsiEdit.js | 6 +- www/manager6/storage/ImageView.js | 2 +- www/manager6/storage/LVMEdit.js | 10 +-- www/manager6/storage/LvmThinEdit.js | 10 +-- www/manager6/storage/NFSEdit.js | 8 +- www/manager6/storage/PBSEdit.js | 2 +- www/manager6/storage/RBDEdit.js | 4 +- www/manager6/storage/Summary.js | 4 +- www/manager6/storage/TemplateView.js | 20 +++-- www/manager6/storage/ZFSEdit.js | 2 +- www/manager6/storage/ZFSPoolEdit.js | 9 ++- www/manager6/tree/ResourceTree.js | 13 ++- www/manager6/tree/SnapshotTree.js | 4 +- www/manager6/window/Backup.js | 12 +-- www/manager6/window/BulkAction.js | 6 +- www/manager6/window/CephInstall.js | 7 +- www/manager6/window/Clone.js | 11 ++- www/manager6/window/LoginWindow.js | 7 +- www/manager6/window/Migrate.js | 16 ++-- www/manager6/window/Restore.js | 12 +-- www/manager6/window/SafeDestroy.js | 10 +-- www/manager6/window/Settings.js | 18 ++--- www/manager6/window/Snapshot.js | 4 +- www/manager6/window/StartupEdit.js | 9 +-- www/manager6/window/Wizard.js | 4 +- 185 files changed, 639 insertions(+), 760 deletions(-) diff --git a/www/manager6/Parser.js b/www/manager6/Parser.js index 943c635c..4a2eac2c 100644 --- a/www/manager6/Parser.js +++ b/www/manager6/Parser.js @@ -1,7 +1,8 @@ // Some configuration values are complex strings - // so we need parsers/generators for them. -Ext.define('PVE.Parser', { statics: { +Ext.define('PVE.Parser', { + statics: { // this class only contains static functions @@ -155,7 +156,6 @@ Ext.define('PVE.Parser', { statics: { }, printQemuNetwork: function(net) { - var netstr = net.model; if (net.macaddr) { netstr += "=" + net.macaddr; @@ -239,7 +239,6 @@ Ext.define('PVE.Parser', { statics: { }, printQemuDrive: function(drive) { - var drivestr = drive.file; Ext.Object.each(drive, function(key, value) { @@ -333,7 +332,7 @@ Ext.define('PVE.Parser', { statics: { errors = true; return false; // break } - if (match_res[1] === 'bridge'){ + if (match_res[1] === 'bridge') { var bridgevlanf = match_res[2]; var bridge_res = bridgevlanf.match(/^(vmbr(\d+))(v(\d+))?(f)?$/); if (!bridge_res) { @@ -368,18 +367,17 @@ Ext.define('PVE.Parser', { statics: { var tmparray = []; Ext.Array.each(['ifname', 'mac', 'bridge', 'host_ifname', 'host_mac', 'mac_filter', 'tag', 'firewall'], function(key) { var value = data[key]; - if (key === 'bridge'){ - if(data.tag){ + if (key === 'bridge') { + if (data.tag) { value = value + 'v' + data.tag; } - if (data.firewall){ + if (data.firewall) { value = value + 'f'; } } if (value) { tmparray.push(key + '=' + value); } - }); netarray.push(tmparray.join(',')); }); @@ -544,7 +542,7 @@ Ext.define('PVE.Parser', { statics: { }, parseQemuSmbios1: function(value) { - var res = value.split(',').reduce(function (accumulator, currentValue) { + var res = value.split(',').reduce(function(accumulator, currentValue) { var splitted = currentValue.split(new RegExp("=(.+)")); accumulator[splitted[0]] = splitted[1]; return accumulator; @@ -561,7 +559,6 @@ Ext.define('PVE.Parser', { statics: { }, printQemuSmbios1: function(data) { - var datastr = ''; var base64 = false; Ext.Object.each(data, function(key, value) { @@ -714,4 +711,5 @@ Ext.define('PVE.Parser', { statics: { }); return [res, extradata]; }, -}}); +} +}); diff --git a/www/manager6/StateProvider.js b/www/manager6/StateProvider.js index aa5be2e8..3dbd53f0 100644 --- a/www/manager6/StateProvider.js +++ b/www/manager6/StateProvider.js @@ -59,7 +59,7 @@ Ext.define('PVE.StateProvider', { 'ha-groups': 47, 'ha-resources': 46, 'ceph-log': 45, - 'ceph-crushmap':44, + 'ceph-crushmap': 44, 'ceph-pools': 43, 'ceph-osdtree': 42, 'ceph-disklist': 41, @@ -173,7 +173,7 @@ Ext.define('PVE.StateProvider', { return ctoken; }, - constructor: function(config){ + constructor: function(config) { var me = this; me.callParent([config]); @@ -184,7 +184,7 @@ Ext.define('PVE.StateProvider', { //console.log("HC " + token); if (!token) { var res = window.confirm(gettext('Are you sure you want to navigate away from this page?')); - if (res){ + if (res) { // process text value and close... Ext.History.back(); } else { @@ -213,7 +213,7 @@ Ext.define('PVE.StateProvider', { Ext.History.on('change', history_change_cb); }, - get: function(name, defaultValue){ + get: function(name, defaultValue) { var me = this; var data; @@ -230,7 +230,7 @@ Ext.define('PVE.StateProvider', { return data; }, - clear: function(name){ + clear: function(name) { var me = this; if (typeof me.UIState[name] != "undefined") { @@ -240,7 +240,7 @@ Ext.define('PVE.StateProvider', { me.callParent(arguments); }, - set: function(name, value, fireevent){ + set: function(name, value, fireevent) { var me = this; //console.log("SET " + name + " " + Ext.encode(value)); diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index eb21357d..80be1e8d 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -19,7 +19,8 @@ Ext.Ajax.defaultHeaders = { 'Accept': 'application/json', }; -Ext.define('PVE.Utils', { utilities: { +Ext.define('PVE.Utils', { + utilities: { // this singleton contains miscellaneous utilities @@ -61,10 +62,10 @@ Ext.define('PVE.Utils', { utilities: { { desc: '2000', val: 'w2k' }, ], 'Solaris Kernel': [ - { desc: '-', val: 'solaris'}, + { desc: '-', val: 'solaris' }, ], 'Other': [ - { desc: '-', val: 'other'}, + { desc: '-', val: 'other' }, ], }, @@ -78,7 +79,7 @@ Ext.define('PVE.Utils', { utilities: { } var icon = 'faded fa-question'; - switch(state) { + switch (state) { case 'good': icon = 'good fa-check'; break; @@ -145,7 +146,7 @@ Ext.define('PVE.Utils', { utilities: { if (av === undefined && bv === undefined) { return 0; - } else if (av === undefined) { + } else if (av === undefined) { return -1; } else if (bv === undefined) { return 1; @@ -155,7 +156,6 @@ Ext.define('PVE.Utils', { utilities: { // else we need to look at the next parts } } - }, get_ceph_icon_html: function(health, fw) { @@ -168,11 +168,11 @@ Ext.define('PVE.Utils', { utilities: { }, map_ceph_health: { - 'HEALTH_OK':'good', - 'HEALTH_UPGRADE':'upgrade', - 'HEALTH_OLD':'old', - 'HEALTH_WARN':'warning', - 'HEALTH_ERR':'critical', + 'HEALTH_OK': 'good', + 'HEALTH_UPGRADE': 'upgrade', + 'HEALTH_OLD': 'old', + 'HEALTH_WARN': 'warning', + 'HEALTH_ERR': 'critical', }, render_ceph_health: function(healthObj) { @@ -194,7 +194,7 @@ Ext.define('PVE.Utils', { utilities: { }, render_zfs_health: function(value) { - if (typeof value == 'undefined'){ + if (typeof value == 'undefined') { return ""; } var iconCls = 'question-circle'; @@ -216,7 +216,6 @@ Ext.define('PVE.Utils', { utilities: { } return ' ' + value; - }, render_pbs_fingerprint: fp => fp.substring(0, 23), @@ -239,7 +238,7 @@ Ext.define('PVE.Utils', { utilities: { if (v === undefined || v === null) { return i('question-circle-o warning', gettext('None')); } - let tip = "" + let tip = ""; let txt = gettext('Failed'); let iconCls = 'times critical'; if (v.state === 'ok') { @@ -286,7 +285,7 @@ Ext.define('PVE.Utils', { utilities: { var dows = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat']; var selected = []; var cur = -1; - val.split(',').forEach(function(day){ + val.split(',').forEach(function(day) { cur++; var dow = (dows.indexOf(day)+6)%7; if (cur === dow) { @@ -365,7 +364,7 @@ Ext.define('PVE.Utils', { utilities: { return info; }, - render_kvm_ostype: function (value) { + render_kvm_ostype: function(value) { var osinfo = PVE.Utils.get_kvm_osinfo(value); if (osinfo.desc && osinfo.desc !== '-') { return osinfo.base + ' ' + osinfo.desc; @@ -374,7 +373,7 @@ Ext.define('PVE.Utils', { utilities: { } }, - render_hotplug_features: function (value) { + render_hotplug_features: function(value) { var fa = []; if (!value || (value === '0')) { @@ -413,7 +412,7 @@ Ext.define('PVE.Utils', { utilities: { render_qga_features: function(value) { if (!value) { - return Proxmox.Utils.defaultText + ' (' + Proxmox.Utils.disabledText + ')'; + return Proxmox.Utils.defaultText + ' (' + Proxmox.Utils.disabledText + ')'; } var props = PVE.Parser.parsePropertyString(value, 'enabled'); if (!PVE.Parser.parseBoolean(props.enabled)) { @@ -424,7 +423,7 @@ Ext.define('PVE.Utils', { utilities: { var agentstring = Proxmox.Utils.enabledText; Ext.Object.each(props, function(key, value) { - var keystring = '' ; + var keystring = ''; agentstring += ', ' + key + ': '; if (key === 'type') { @@ -562,7 +561,7 @@ Ext.define('PVE.Utils', { utilities: { none: Proxmox.Utils.noneText, }, - render_kvm_language: function (value) { + render_kvm_language: function(value) { if (!value || value === '__default__') { return Proxmox.Utils.defaultText; } @@ -603,7 +602,7 @@ Ext.define('PVE.Utils', { utilities: { }); }, - render_kvm_vga_driver: function (value) { + render_kvm_vga_driver: function(value) { if (!value) { return Proxmox.Utils.defaultText; } @@ -898,7 +897,7 @@ Ext.define('PVE.Utils', { utilities: { if (value.managed) { text = value.state || Proxmox.Utils.noneText; - text += ', ' + Proxmox.Utils.groupText + ': '; + text += ', ' + Proxmox.Utils.groupText + ': '; text += value.group || Proxmox.Utils.noneText; } @@ -923,12 +922,11 @@ Ext.define('PVE.Utils', { utilities: { return data.volid.replace(/^.*?:(.*?\/)?/, ''); }, - render_serverity: function (value) { + render_serverity: function(value) { return PVE.Utils.log_severity_hash[value] || value; }, render_cpu: function(value, metaData, record, rowIndex, colIndex, store) { - if (!(record.data.uptime && Ext.isNumeric(value))) { return ''; } @@ -945,7 +943,6 @@ Ext.define('PVE.Utils', { utilities: { }, render_size: function(value, metaData, record, rowIndex, colIndex, store) { - if (!Ext.isNumeric(value)) { return ''; } @@ -979,7 +976,7 @@ Ext.define('PVE.Utils', { utilities: { if (!Ext.isNumeric(value) || value === -1) { return ''; } - if (value > 1 ) { + if (value > 1) { // we got no percentage but bytes var mem = value; var maxmem = record.data.maxmem; @@ -995,7 +992,6 @@ Ext.define('PVE.Utils', { utilities: { }, render_mem_usage: function(value, metaData, record, rowIndex, colIndex, store) { - var mem = value; var maxmem = record.data.maxmem; @@ -1011,7 +1007,6 @@ Ext.define('PVE.Utils', { utilities: { }, calculate_disk_usage: function(data) { - if (!Ext.isNumeric(data.disk) || data.type === 'qemu' || (data.type === 'lxc' && data.uptime === 0) || @@ -1031,7 +1026,6 @@ Ext.define('PVE.Utils', { utilities: { }, render_disk_usage: function(value, metaData, record, rowIndex, colIndex, store) { - var disk = value; var maxdisk = record.data.maxdisk; var type = record.data.type; @@ -1076,10 +1070,9 @@ Ext.define('PVE.Utils', { utilities: { }, render_resource_type: function(value, metaData, record, rowIndex, colIndex, store) { - var cls = PVE.Utils.get_object_icon_class(value, record.data); - var fa = ' '; + var fa = ' '; return fa + value; }, @@ -1159,7 +1152,7 @@ Ext.define('PVE.Utils', { utilities: { '4': gettext('Device Ineligible'), '5': gettext('Timeout'), }; - return "U2F Error: " + ErrorNames[error] || Proxmox.Utils.unknownText; + return "U2F Error: " + ErrorNames[error] || Proxmox.Utils.unknownText; }, windowHostname: function() { @@ -1207,7 +1200,6 @@ Ext.define('PVE.Utils', { utilities: { }, defaultViewer: function(consoles) { - var allowSpice, allowXtermjs; if (consoles === true) { @@ -1248,13 +1240,12 @@ Ext.define('PVE.Utils', { utilities: { } }, - openSpiceViewer: function(url, params){ - + openSpiceViewer: function(url, params) { var downloadWithName = function(uri, name) { var link = Ext.DomHelper.append(document.body, { tag: 'a', href: uri, - css : 'display:none;visibility:hidden;height:0px;', + css: 'display:none;visibility:hidden;height:0px;', }); // Note: we need to tell android the correct file name extension @@ -1278,10 +1269,10 @@ Ext.define('PVE.Utils', { utilities: { url: url, params: params, method: 'POST', - failure: function(response, opts){ + failure: function(response, opts) { Ext.Msg.alert('Error', response.htmlStatus); }, - success: function(response, opts){ + success: function(response, opts) { var raw = "[virt-viewer]\n"; Ext.Object.each(response.result.data, function(k, v) { raw += k + "=" + v + "\n"; @@ -1321,7 +1312,6 @@ Ext.define('PVE.Utils', { utilities: { // test automation helper call_menu_handler: function(menu, text) { - var list = menu.query('menuitem'); Ext.Array.each(list, function(item) { @@ -1433,7 +1423,7 @@ Ext.define('PVE.Utils', { utilities: { if (Ext.isArray(types)) { busses = types; } else if (Ext.isDefined(types)) { - busses = [ types ]; + busses = [types]; } // check if we only have valid busses @@ -1479,7 +1469,7 @@ Ext.define('PVE.Utils', { utilities: { hardware_counts: { net: 32, usb: 5, hostpci: 16, audio: 1, efidisk: 1, serial: 4, rng: 1 }, - cleanEmptyObjectKeys: function (obj) { + cleanEmptyObjectKeys: function(obj) { var propName; for (propName in obj) { if (obj.hasOwnProperty(propName)) { @@ -1497,26 +1487,20 @@ Ext.define('PVE.Utils', { utilities: { acme.domains = [domain]; } else { acme.domains.push(domain); - acme.domains = acme.domains.filter((value, index, self) => { - return self.indexOf(value) === index; - }); + acme.domains = acme.domains.filter((value, index, self) => self.indexOf(value) === index); } return acme; }, remove_domain_from_acme: function(acme, domain) { if (acme.domains !== undefined) { - acme.domains = acme.domains.filter((value, index, self) => { - return self.indexOf(value) === index && value !== domain; - }); + acme.domains = acme.domains.filter((value, index, self) => self.indexOf(value) === index && value !== domain); } return acme; }, handleStoreErrorOrMask: function(me, store, regex, callback) { - - me.mon(store, 'load', function (proxy, response, success, operation) { - + me.mon(store, 'load', function(proxy, response, success, operation) { if (success) { Proxmox.Utils.setErrorMask(me, false); return; @@ -1537,12 +1521,12 @@ Ext.define('PVE.Utils', { utilities: { }); }, - showCephInstallOrMask: function(container, msg, nodename, callback){ + showCephInstallOrMask: function(container, msg, nodename, callback) { var regex = new RegExp("not (installed|initialized)", "i"); if (msg.match(regex)) { if (Proxmox.UserName === 'root@pam') { container.el.mask(); - if (!container.down('pveCephInstallWindow')){ + if (!container.down('pveCephInstallWindow')) { var isInstalled = msg.match(/not initialized/i) ? true : false; var win = Ext.create('PVE.ceph.Install', { nodename: nodename, diff --git a/www/manager6/VNCConsole.js b/www/manager6/VNCConsole.js index b8dd376b..9057e447 100644 --- a/www/manager6/VNCConsole.js +++ b/www/manager6/VNCConsole.js @@ -29,7 +29,7 @@ Ext.define('PVE.noVncConsole', { // always use same iframe, to avoid running several noVnc clients // at same time (to avoid performance problems) - var box = Ext.create('Ext.ux.IFrame', { itemid : "vncconsole" }); + var box = Ext.create('Ext.ux.IFrame', { itemid: "vncconsole" }); var type = me.xtermjs ? 'xtermjs' : 'novnc'; Ext.apply(me, { diff --git a/www/manager6/Workspace.js b/www/manager6/Workspace.js index f77b5024..c9c4808d 100644 --- a/www/manager6/Workspace.js +++ b/www/manager6/Workspace.js @@ -55,7 +55,7 @@ Ext.define('PVE.Workspace', { me.login.show(); }, - initComponent : function() { + initComponent: function() { var me = this; Ext.tip.QuickTipManager.init(); @@ -104,7 +104,6 @@ Ext.define('PVE.Workspace', { }, interval: 15*60*1000, }); - }, }); @@ -129,13 +128,12 @@ Ext.define('PVE.StdWorkspace', { cont.add(comp); if (cur !== null && lay.getNext()) { lay.next(); - var task = Ext.create('Ext.util.DelayedTask', function(){ + var task = Ext.create('Ext.util.DelayedTask', function() { cont.remove(cur); }); task.delay(10); } - } - else { + } else { // helper for cleaning the content when logging out cont.removeAll(); } @@ -202,7 +200,7 @@ Ext.define('PVE.StdWorkspace', { ui.updateLayout(); }, - initComponent : function() { + initComponent: function() { var me = this; Ext.History.init(); @@ -432,7 +430,7 @@ Ext.define('PVE.StdWorkspace', { margin: '0 0 0 5', split: true, width: 200, - items: [ selview, rtree ], + items: [selview, rtree], listeners: { resize: function(panel, width, height) { var viewWidth = me.getSize().width; @@ -448,12 +446,12 @@ Ext.define('PVE.StdWorkspace', { stateId: 'pvesouth', itemId: 'south', region: 'south', - margin:'0 5 5 5', + margin: '0 5 5 5', title: gettext('Logs'), collapsible: true, header: false, height: 200, - split:true, + split: true, listeners: { resize: function(panel, width, height) { var viewHeight = me.getSize().height; @@ -471,10 +469,10 @@ Ext.define('PVE.StdWorkspace', { me.updateUserInfo(); // on resize, center all modal windows - Ext.on('resize', function(){ + Ext.on('resize', function() { var wins = Ext.ComponentQuery.query('window[modal]'); if (wins.length > 0) { - wins.forEach(function(win){ + wins.forEach(function(win) { win.alignTo(me, 'c-c'); }); } diff --git a/www/manager6/button/ConsoleButton.js b/www/manager6/button/ConsoleButton.js index 8dab088c..9d117041 100644 --- a/www/manager6/button/ConsoleButton.js +++ b/www/manager6/button/ConsoleButton.js @@ -19,14 +19,14 @@ Ext.define('PVE.button.ConsoleButton', { text: gettext('Console'), - setEnableSpice: function(enable){ + setEnableSpice: function(enable) { var me = this; me.enableSpice = enable; me.down('#spicemenu').setDisabled(!enable); }, - setEnableXtermJS: function(enable){ + setEnableXtermJS: function(enable) { var me = this; me.enableXtermjs = enable; @@ -45,7 +45,7 @@ Ext.define('PVE.button.ConsoleButton', { menu: [ { - xtype:'menuitem', + xtype: 'menuitem', text: 'noVNC', iconCls: 'pve-itype-icon-novnc', type: 'html5', diff --git a/www/manager6/button/Revert.js b/www/manager6/button/Revert.js index f1d69ce1..169b9c95 100644 --- a/www/manager6/button/Revert.js +++ b/www/manager6/button/Revert.js @@ -20,7 +20,7 @@ Ext.define('PVE.button.PendingRevert', { if (!rec) return; let rowdef = view.rows[rec.data.key] || {}; - let keys = rowdef.multiKey || [ rec.data.key ]; + let keys = rowdef.multiKey || [rec.data.key]; Proxmox.Utils.API2Request({ url: this.apiurl || view.editorConfig.url, diff --git a/www/manager6/button/Split.js b/www/manager6/button/Split.js index e7d45fcf..93d60835 100644 --- a/www/manager6/button/Split.js +++ b/www/manager6/button/Split.js @@ -55,7 +55,6 @@ Ext.define('PVE.button.Split', { }, initComponent: function() { - var me = this; if (me.handler) { @@ -73,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); @@ -86,7 +85,6 @@ Ext.define('PVE.button.Split', { me.callParent(); if (me.selModel) { - me.mon(me.selModel, "selectionchange", function() { var rec = me.selModel.getSelection()[0]; if (!rec || (me.enableFn(rec) === false)) { diff --git a/www/manager6/ceph/CephInstallWizard.js b/www/manager6/ceph/CephInstallWizard.js index 6c60d221..a7630056 100644 --- a/www/manager6/ceph/CephInstallWizard.js +++ b/www/manager6/ceph/CephInstallWizard.js @@ -49,8 +49,8 @@ Ext.define('PVE.ceph.CephVersionSelector', { }, }, data: [ - {release: "nautilus", version: "14.2"}, - {release: "octopus", version: "15.2"}, + { release: "nautilus", version: "14.2" }, + { release: "octopus", version: "15.2" }, //{release: "pacific", version: "16.1"}, ], }, @@ -163,7 +163,7 @@ Ext.define('PVE.ceph.CephInstallWizard', { tp.setActiveTab(ntab); } }, - setInitialTab: function (index) { + setInitialTab: function(index) { var tp = this.down('#wizcontent'); var initialTab = tp.items.getAt(index); initialTab.enable(); @@ -203,7 +203,7 @@ Ext.define('PVE.ceph.CephInstallWizard', { { xtype: 'pveCephHighestVersionDisplay', labelWidth: 180, - cbind:{ + cbind: { nodename: '{nodename}', }, gotNewestVersion: function(release, maxversiontext, maxversion) { @@ -256,7 +256,7 @@ Ext.define('PVE.ceph.CephInstallWizard', { title: gettext('Installation'), xtype: 'panel', layout: 'fit', - cbind:{ + cbind: { nodename: '{nodename}', }, viewModel: {}, // needed to inherit parent viewModel data @@ -281,7 +281,6 @@ Ext.define('PVE.ceph.CephInstallWizard', { }, listeners: { load: function(rec, response, success, operation) { - if (success) { me.updateStore.stopUpdate(); me.down('textfield').setValue('success'); @@ -485,7 +484,6 @@ Ext.define('PVE.ceph.CephInstallWizard', { Ext.Msg.alert(gettext('Error'), response.htmlStatus); }, }); - } else { me.up('pveCephInstallWizard').navigateNext(); } @@ -513,7 +511,7 @@ Ext.define('PVE.ceph.CephInstallWizard', { var tp = this.up('#wizcontent'); var idx = tp.items.indexOf(this)-1; - for(;idx >= 0;idx--) { + for (;idx >= 0; idx--) { var nc = tp.items.getAt(idx); if (nc) { nc.disable(); diff --git a/www/manager6/ceph/Config.js b/www/manager6/ceph/Config.js index fa665bf1..7f07f15f 100644 --- a/www/manager6/ceph/Config.js +++ b/www/manager6/ceph/Config.js @@ -79,13 +79,12 @@ Ext.define('PVE.node.CephConfig', { me.update(gettext('Error') + " " + response.htmlStatus); var msg = response.htmlStatus; PVE.Utils.showCephInstallOrMask(me.ownerCt, msg, me.pveSelNode.data.node, - function(win){ - me.mon(win, 'cephInstallWindowClosed', function(){ + function(win) { + me.mon(win, 'cephInstallWindowClosed', function() { me.load(); }); }, ); - }, success: function(response, opts) { var data = response.result.data; diff --git a/www/manager6/ceph/Crush.js b/www/manager6/ceph/Crush.js index 2a35cc8c..cbd835ba 100644 --- a/www/manager6/ceph/Crush.js +++ b/www/manager6/ceph/Crush.js @@ -17,8 +17,8 @@ Ext.define('PVE.node.CephCrushMap', { me.update(gettext('Error') + " " + response.htmlStatus); var msg = response.htmlStatus; PVE.Utils.showCephInstallOrMask(me.ownerCt, msg, me.pveSelNode.data.node, - function(win){ - me.mon(win, 'cephInstallWindowClosed', function(){ + function(win) { + me.mon(win, 'cephInstallWindowClosed', function() { me.load(); }); }, diff --git a/www/manager6/ceph/FS.js b/www/manager6/ceph/FS.js index 76bba3a4..397e90f9 100644 --- a/www/manager6/ceph/FS.js +++ b/www/manager6/ceph/FS.js @@ -55,7 +55,7 @@ Ext.define('PVE.CephCreateFS', { }, ], - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { @@ -124,11 +124,11 @@ Ext.define('PVE.NodeCephFSPanel', { }, })); var regex = new RegExp("not (installed|initialized)", "i"); - PVE.Utils.handleStoreErrorOrMask(view, view.rstore, regex, function(me, error){ + PVE.Utils.handleStoreErrorOrMask(view, view.rstore, regex, function(me, error) { me.rstore.stopUpdate(); PVE.Utils.showCephInstallOrMask(me.ownerCt, error.statusText, view.nodename, - function(win){ - me.mon(win, 'cephInstallWindowClosed', function(){ + function(win) { + me.mon(win, 'cephInstallWindowClosed', function() { me.rstore.startUpdate(); }); }, @@ -214,7 +214,7 @@ Ext.define('PVE.NodeCephFSPanel', { }, function() { Ext.define('pve-ceph-fs', { extend: 'Ext.data.Model', - fields: [ 'name', 'data_pool', 'metadata_pool' ], + fields: ['name', 'data_pool', 'metadata_pool'], proxy: { type: 'proxmox', url: "/api2/json/nodes/localhost/ceph/fs", diff --git a/www/manager6/ceph/Log.js b/www/manager6/ceph/Log.js index 19ab1f6b..4fda3209 100644 --- a/www/manager6/ceph/Log.js +++ b/www/manager6/ceph/Log.js @@ -8,8 +8,8 @@ Ext.define('PVE.ceph.Log', { var me = this; var msg = response.htmlStatus; var windowShow = PVE.Utils.showCephInstallOrMask(me, msg, me.nodename, - function(win){ - me.mon(win, 'cephInstallWindowClosed', function(){ + function(win) { + me.mon(win, 'cephInstallWindowClosed', function() { me.loadTask.delay(200); }); }, diff --git a/www/manager6/ceph/Monitor.js b/www/manager6/ceph/Monitor.js index eef0defd..a5c63f92 100644 --- a/www/manager6/ceph/Monitor.js +++ b/www/manager6/ceph/Monitor.js @@ -2,7 +2,7 @@ Ext.define('PVE.node.CephMonMgrList', { extend: 'Ext.container.Container', xtype: 'pveNodeCephMonMgr', - mixins: ['Proxmox.Mixin.CBind' ], + mixins: ['Proxmox.Mixin.CBind'], onlineHelp: 'chapter_pveceph', diff --git a/www/manager6/ceph/Pool.js b/www/manager6/ceph/Pool.js index fb2dd873..5dabd4e6 100644 --- a/www/manager6/ceph/Pool.js +++ b/www/manager6/ceph/Pool.js @@ -73,7 +73,7 @@ Ext.define('PVE.CephCreatePool', { }, }, ], - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { @@ -101,7 +101,7 @@ Ext.define('PVE.node.CephPoolList', { stateId: 'grid-ceph-pools', bufferedRenderer: false, - features: [ { ftype: 'summary'} ], + features: [{ ftype: 'summary' }], columns: [ { @@ -201,11 +201,11 @@ Ext.define('PVE.node.CephPoolList', { var store = Ext.create('Proxmox.data.DiffStore', { rstore: rstore }); var regex = new RegExp("not (installed|initialized)", "i"); - PVE.Utils.handleStoreErrorOrMask(me, rstore, regex, function(me, error){ + PVE.Utils.handleStoreErrorOrMask(me, rstore, regex, function(me, error) { me.store.rstore.stopUpdate(); PVE.Utils.showCephInstallOrMask(me, error.statusText, nodename, - function(win){ - me.mon(win, 'cephInstallWindowClosed', function(){ + function(win) { + me.mon(win, 'cephInstallWindowClosed', function() { me.store.rstore.startUpdate(); }); }, @@ -255,7 +255,7 @@ Ext.define('PVE.node.CephPoolList', { Ext.apply(me, { store: store, selModel: sm, - tbar: [ create_btn, destroy_btn ], + tbar: [create_btn, destroy_btn], listeners: { activate: () => rstore.startUpdate(), destroy: () => rstore.stopUpdate(), @@ -265,18 +265,17 @@ Ext.define('PVE.node.CephPoolList', { me.callParent(); }, }, function() { - Ext.define('ceph-pool-list', { extend: 'Ext.data.Model', - fields: [ 'pool_name', - { name: 'pool', type: 'integer'}, - { name: 'size', type: 'integer'}, - { name: 'min_size', type: 'integer'}, - { name: 'pg_num', type: 'integer'}, - { name: 'bytes_used', type: 'integer'}, - { name: 'percent_used', type: 'number'}, - { name: 'crush_rule', type: 'integer'}, - { name: 'crush_rule_name', type: 'string'}, + fields: ['pool_name', + { name: 'pool', type: 'integer' }, + { name: 'size', type: 'integer' }, + { name: 'min_size', type: 'integer' }, + { name: 'pg_num', type: 'integer' }, + { name: 'bytes_used', type: 'integer' }, + { name: 'percent_used', type: 'number' }, + { name: 'crush_rule', type: 'integer' }, + { name: 'crush_rule_name', type: 'string' }, ], idProperty: 'pool_name', }); @@ -315,7 +314,7 @@ Ext.define('PVE.form.CephRuleSelector', { me.callParent(); store.load({ - callback: function(rec, op, success){ + callback: function(rec, op, success) { if (success && rec.length > 0) { me.select(rec[0]); } diff --git a/www/manager6/ceph/ServiceList.js b/www/manager6/ceph/ServiceList.js index 4acf6ef2..fb830d09 100644 --- a/www/manager6/ceph/ServiceList.js +++ b/www/manager6/ceph/ServiceList.js @@ -30,7 +30,7 @@ Ext.define('PVE.CephCreateService', { }, ], - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { @@ -159,8 +159,8 @@ Ext.define('PVE.node.CephServiceList', { PVE.Utils.handleStoreErrorOrMask(view, view.rstore, regex, function(me, error) { view.rstore.stopUpdate(); PVE.Utils.showCephInstallOrMask(view.ownerCt, error.statusText, view.nodename, - function(win){ - me.mon(win, 'cephInstallWindowClosed', function(){ + function(win) { + me.mon(win, 'cephInstallWindowClosed', function() { view.rstore.startUpdate(); }); }, @@ -206,7 +206,7 @@ Ext.define('PVE.node.CephServiceList', { var view = this.getView(); var rec = view.getSelection()[0]; var servicename = 'ceph-' + view.type + '@' + rec.data.name; - var url = "/api2/extjs/nodes/" + rec.data.host + "/syslog?service=" + encodeURIComponent(servicename); + var url = "/api2/extjs/nodes/" + rec.data.host + "/syslog?service=" + encodeURIComponent(servicename); var win = Ext.create('Ext.window.Window', { title: gettext('Syslog') + ': ' + servicename, modal: true, @@ -367,14 +367,15 @@ Ext.define('PVE.node.CephServiceList', { }, }, function() { - Ext.define('ceph-service-list', { extend: 'Ext.data.Model', - fields: [ 'addr', 'name', 'rank', 'host', 'quorum', 'state', + fields: ['addr', 'name', 'rank', 'host', 'quorum', 'state', 'ceph_version', 'ceph_version_short', - { type: 'string', name: 'version', calculate: function(data) { + { + type: 'string', name: 'version', calculate: function(data) { return PVE.Utils.parse_ceph_version(data); - } }, + } +}, ], idProperty: 'name', }); diff --git a/www/manager6/ceph/Services.js b/www/manager6/ceph/Services.js index 5871117e..3248546d 100644 --- a/www/manager6/ceph/Services.js +++ b/www/manager6/ceph/Services.js @@ -11,7 +11,7 @@ Ext.define('PVE.ceph.Services', { defaults: { xtype: 'box', style: { - 'text-align':'center', + 'text-align': 'center', }, }, @@ -242,12 +242,12 @@ Ext.define('PVE.ceph.ServiceList', { xtype: 'pveCephServiceList', style: { - 'text-align':'center', + 'text-align': 'center', }, defaults: { xtype: 'box', style: { - 'text-align':'center', + 'text-align': 'center', }, }, diff --git a/www/manager6/ceph/Status.js b/www/manager6/ceph/Status.js index e33af2ba..9c77d4ed 100644 --- a/www/manager6/ceph/Status.js +++ b/www/manager6/ceph/Status.js @@ -390,11 +390,11 @@ Ext.define('PVE.node.CephStatus', { me.writes = me.down('#writes'); var regex = new RegExp("not (installed|initialized)", "i"); - PVE.Utils.handleStoreErrorOrMask(me, me.store, regex, function(me, error){ + PVE.Utils.handleStoreErrorOrMask(me, me.store, regex, function(me, error) { me.store.stopUpdate(); PVE.Utils.showCephInstallOrMask(me, error.statusText, (nodename || 'localhost'), - function(win){ - me.mon(win, 'cephInstallWindowClosed', function(){ + 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 e3b38958..716b6a01 100644 --- a/www/manager6/ceph/StatusDetail.js +++ b/www/manager6/ceph/StatusDetail.js @@ -11,7 +11,7 @@ Ext.define('PVE.ceph.StatusDetail', { defaults: { xtype: 'box', style: { - 'text-align':'center', + 'text-align': 'center', }, }, @@ -215,7 +215,7 @@ Ext.define('PVE.ceph.StatusDetail', { // update PGs sorted var pgmap = status.pgmap || {}; var pgs_by_state = pgmap.pgs_by_state || []; - pgs_by_state.sort(function(a, b){ + pgs_by_state.sort(function(a, b) { return (a.state_name < b.state_name)?-1:(a.state_name === b.state_name)?0:1; }); @@ -241,7 +241,7 @@ Ext.define('PVE.ceph.StatusDetail', { }); me.getComponent('pgchart').getStore().setData(me.statecategories); - me.getComponent('pgs').update({states: pgs_by_state}); + me.getComponent('pgs').update({ states: pgs_by_state }); var downinregex = /(\d+) osds down/; var downin_osds = 0; diff --git a/www/manager6/data/ResourceStore.js b/www/manager6/data/ResourceStore.js index 2ece3dee..3b466f85 100644 --- a/www/manager6/data/ResourceStore.js +++ b/www/manager6/data/ResourceStore.js @@ -15,7 +15,7 @@ Ext.define('PVE.data.ResourceStore', { var nodes = []; me.each(function(record) { if (record.get('type') == "node") { - nodes.push( record.getData() ); + nodes.push(record.getData()); } }); @@ -282,7 +282,7 @@ Ext.define('PVE.data.ResourceStore', { var fields = []; var fieldNames = []; Ext.Object.each(field_defaults, function(key, value) { - var field = {name: key, type: value.type}; + var field = { name: key, type: value.type }; if (Ext.isDefined(value.convert)) { field.convert = value.convert; } diff --git a/www/manager6/data/model/RRDModels.js b/www/manager6/data/model/RRDModels.js index 5e57626e..2240dcab 100644 --- a/www/manager6/data/model/RRDModels.js +++ b/www/manager6/data/model/RRDModels.js @@ -2,14 +2,14 @@ Ext.define('pve-rrd-node', { extend: 'Ext.data.Model', fields: [ { - name:'cpu', + name: 'cpu', // percentage convert: function(value) { return value*100; }, }, { - name:'iowait', + name: 'iowait', // percentage convert: function(value) { return value*100; @@ -33,7 +33,7 @@ Ext.define('pve-rrd-guest', { extend: 'Ext.data.Model', fields: [ { - name:'cpu', + name: 'cpu', // percentage convert: function(value) { return value*100; diff --git a/www/manager6/dc/ACLView.js b/www/manager6/dc/ACLView.js index b9040694..3e66386b 100644 --- a/www/manager6/dc/ACLView.js +++ b/www/manager6/dc/ACLView.js @@ -4,8 +4,7 @@ Ext.define('PVE.dc.ACLAdd', { url: '/access/acl', method: 'PUT', isAdd: true, - initComponent : function() { - + initComponent: function() { var me = this; me.isCreate = true; @@ -68,7 +67,7 @@ Ext.define('PVE.dc.ACLAdd', { }); Ext.apply(me, { - items: [ ipanel ], + items: [ipanel], }); me.callParent(); @@ -88,7 +87,7 @@ Ext.define('PVE.dc.ACLView', { // use fixed path path: undefined, - initComponent : function() { + initComponent: function() { var me = this; var store = Ext.create('Ext.data.Store', { @@ -187,7 +186,7 @@ Ext.define('PVE.dc.ACLView', { callback: function() { reload(); }, - failure: function (response, opts) { + failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); }, }); @@ -258,7 +257,6 @@ Ext.define('PVE.dc.ACLView', { me.callParent(); }, }, function() { - Ext.define('pve-acl', { extend: 'Ext.data.Model', fields: [ @@ -269,5 +267,4 @@ Ext.define('PVE.dc.ACLView', { }, ], }); - }); diff --git a/www/manager6/dc/Backup.js b/www/manager6/dc/Backup.js index 4e49438f..34d072d6 100644 --- a/www/manager6/dc/Backup.js +++ b/www/manager6/dc/Backup.js @@ -4,7 +4,7 @@ Ext.define('PVE.dc.BackupEdit', { defaultFocus: undefined, - initComponent : function() { + initComponent: function() { var me = this; me.isCreate = !me.jobid; @@ -25,7 +25,7 @@ Ext.define('PVE.dc.BackupEdit', { }); // 'value' can be assigned a string or an array - var selModeField = Ext.create('Proxmox.form.KVComboBox', { + var selModeField = Ext.create('Proxmox.form.KVComboBox', { xtype: 'proxmoxKVComboBox', comboItems: [ ['include', gettext('Include selected VMs')], @@ -146,7 +146,7 @@ Ext.define('PVE.dc.BackupEdit', { allowBlank: true, name: 'pool', listeners: { - change: function( selpool, newValue, oldValue) { + change: function(selpool, newValue, oldValue) { selectPoolMembers(newValue); }, }, @@ -242,7 +242,7 @@ Ext.define('PVE.dc.BackupEdit', { var ipanel = Ext.create('Proxmox.panel.InputPanel', { onlineHelp: 'chapter_vzdump', column1: column1, - column2: column2, + column2: column2, onGetValues: function(values) { if (!values.node) { if (!me.isCreate) { @@ -315,7 +315,6 @@ Ext.define('PVE.dc.BackupEdit', { selPool.setVisible(true); selPool.allowBlank = false; selectPoolMembers(selPool.value); - } else { selPool.setVisible(false); selPool.allowBlank = true; @@ -337,7 +336,7 @@ Ext.define('PVE.dc.BackupEdit', { var mode = selModeField.getValue(); if (mode === 'all') { sm.selectAll(true); - } else if (mode === 'pool'){ + } else if (mode === 'pool') { selectPoolMembers(selPool.value); } else { update_vmid_selection(list, mode); @@ -350,7 +349,7 @@ Ext.define('PVE.dc.BackupEdit', { subject: gettext("Backup Job"), url: url, method: method, - items: [ ipanel, vmgrid ], + items: [ipanel, vmgrid], }); me.callParent(); @@ -550,7 +549,8 @@ Ext.define('PVE.dc.BackupDiskTree', { }, }, }, - ]}, + ] +}, }); me.callParent(); @@ -570,7 +570,7 @@ Ext.define('PVE.dc.BackupInfo', { name: 'node', fieldLabel: gettext('Node'), xtype: 'displayfield', - renderer: function (value) { + renderer: function(value) { if (!value) { return '-- ' + gettext('All') + ' --'; } else { @@ -615,7 +615,7 @@ Ext.define('PVE.dc.BackupInfo', { name: 'mailnotification', fieldLabel: gettext('Email notification'), xtype: 'displayfield', - renderer: function (value) { + renderer: function(value) { let msg; switch (value) { case 'always': @@ -637,7 +637,7 @@ Ext.define('PVE.dc.BackupInfo', { name: 'mode', fieldLabel: gettext('Mode'), xtype: 'displayfield', - renderer: function (value) { + renderer: function(value) { let msg; switch (value) { case 'snapshot': @@ -657,7 +657,7 @@ Ext.define('PVE.dc.BackupInfo', { name: 'enabled', fieldLabel: gettext('Enabled'), xtype: 'displayfield', - renderer: function (value) { + renderer: function(value) { if (PVE.Parser.parseBoolean(value.toString())) { return gettext('Yes'); } else { @@ -805,7 +805,7 @@ Ext.define('PVE.dc.BackupView', { allText: '-- ' + gettext('All') + ' --', - initComponent : function() { + initComponent: function() { var me = this; var store = new Ext.data.Store({ @@ -818,7 +818,7 @@ Ext.define('PVE.dc.BackupView', { var not_backed_store = new Ext.data.Store({ sorters: 'vmid', - proxy:{ + proxy: { type: 'proxmox', url: 'api2/json/cluster/backupinfo/not_backed_up', }, @@ -856,7 +856,7 @@ Ext.define('PVE.dc.BackupView', { var run_detail = function() { let me = this; - let record = sm.getSelection()[0] + let record = sm.getSelection()[0]; if (!record) { return; } @@ -881,7 +881,7 @@ Ext.define('PVE.dc.BackupView', { layout: 'fit', title: gettext('Backup Details'), - items:[{ + items: [{ xtype: 'panel', region: 'center', layout: { @@ -914,7 +914,7 @@ Ext.define('PVE.dc.BackupView', { Ext.Msg.alert('Error', "Node '"+ jobNode +"' from backup job isn't online!"); return; } - nodes = [ jobNode ]; + nodes = [jobNode]; } else { let unkownNodes = allNodes.filter(node => node.status !== 'online'); if (unkownNodes.length > 0) @@ -929,7 +929,7 @@ Ext.define('PVE.dc.BackupView', { progressText: '0/' + jobTotalCount, }); - let postRequest = function () { + let postRequest = function() { jobsStarted++; Ext.Msg.updateProgress(jobsStarted / jobTotalCount, jobsStarted + '/' + jobTotalCount); @@ -945,7 +945,7 @@ Ext.define('PVE.dc.BackupView', { url: '/nodes/' + node + '/vzdump', method: 'POST', params: job, - failure: function (response, opts) { + failure: function(response, opts) { errors.push(node + ': ' + response.htmlStatus); postRequest(); }, @@ -969,7 +969,7 @@ Ext.define('PVE.dc.BackupView', { layout: 'fit', title: gettext('Guests without backup job'), - items:[{ + items: [{ xtype: 'panel', region: 'center', layout: { @@ -1128,7 +1128,6 @@ Ext.define('PVE.dc.BackupView', { me.callParent(); }, }, function() { - Ext.define('pve-cluster-backup', { extend: 'Ext.data.Model', fields: [ diff --git a/www/manager6/dc/Cluster.js b/www/manager6/dc/Cluster.js index a6a371be..5880fbfc 100644 --- a/www/manager6/dc/Cluster.js +++ b/www/manager6/dc/Cluster.js @@ -80,7 +80,7 @@ Ext.define('PVE.ClusterAdministration', { vm.set('isInCluster', !!data.totem.cluster_name); vm.set('nodelist', data.nodelist); - var nodeinfo = Ext.Array.findBy(data.nodelist, function (el) { + var nodeinfo = Ext.Array.findBy(data.nodelist, function(el) { return el.name === data.preferred_node; }); diff --git a/www/manager6/dc/ClusterEdit.js b/www/manager6/dc/ClusterEdit.js index 124dcc90..254bfeb0 100644 --- a/www/manager6/dc/ClusterEdit.js +++ b/www/manager6/dc/ClusterEdit.js @@ -243,7 +243,6 @@ Ext.define('PVE.ClusterJoinNodeWindow', { linkEditor.setInfoText(); if (links.length == 1 && joinInfo.ring_addr !== undefined && joinInfo.ring_addr[0] === joinInfo.ipAddress) { - links[0].allowBlank = true; links[0].emptyText = gettext("IP resolved by node's hostname"); } diff --git a/www/manager6/dc/CorosyncLinkEdit.js b/www/manager6/dc/CorosyncLinkEdit.js index 86b9954a..a6e1ecc5 100644 --- a/www/manager6/dc/CorosyncLinkEdit.js +++ b/www/manager6/dc/CorosyncLinkEdit.js @@ -77,7 +77,7 @@ Ext.define('PVE.form.CorosyncLinkEditorController', { let deleteButtons = view.query('button[cls=removeLinkBtn]'); Ext.Array.each(deleteButtons, btn => { btn.setDisabled(disabled); - }) + }); }, getNextFreeNetwork: function() { @@ -122,7 +122,7 @@ Ext.define('PVE.form.CorosyncLinkSelector', { extend: 'Ext.panel.Panel', xtype: 'pveCorosyncLinkSelector', - mixins: ['Proxmox.Mixin.CBind' ], + mixins: ['Proxmox.Mixin.CBind'], cbindData: [], // config @@ -312,7 +312,7 @@ Ext.define('PVE.form.CorosyncLinkEditor', { dockedItems: [{ xtype: 'toolbar', dock: 'bottom', - defaultButtonUI : 'default', + defaultButtonUI: 'default', border: false, padding: '6 0 6 0', bind: { diff --git a/www/manager6/dc/GroupEdit.js b/www/manager6/dc/GroupEdit.js index 0d4944cb..d01f7b01 100644 --- a/www/manager6/dc/GroupEdit.js +++ b/www/manager6/dc/GroupEdit.js @@ -2,7 +2,7 @@ Ext.define('PVE.dc.GroupEdit', { extend: 'Proxmox.window.Edit', alias: ['widget.pveDcGroupEdit'], - initComponent : function() { + initComponent: function() { var me = this; me.isCreate = !me.groupid; diff --git a/www/manager6/dc/GroupView.js b/www/manager6/dc/GroupView.js index 9f1ebecd..c2cac152 100644 --- a/www/manager6/dc/GroupView.js +++ b/www/manager6/dc/GroupView.js @@ -8,7 +8,7 @@ Ext.define('PVE.dc.GroupView', { stateful: true, stateId: 'grid-groups', - initComponent : function() { + initComponent: function() { var me = this; var store = new Ext.data.Store({ diff --git a/www/manager6/dc/Guests.js b/www/manager6/dc/Guests.js index e8bcc52b..c1d2d821 100644 --- a/www/manager6/dc/Guests.js +++ b/www/manager6/dc/Guests.js @@ -20,8 +20,8 @@ Ext.define('PVE.dc.Guests', { xtype: 'box', padding: '0 50 0 50', style: { - 'text-align':'center', - 'line-height':'1.2', + 'text-align': 'center', + 'line-height': '1.2', }, }, items: [{ @@ -117,6 +117,6 @@ Ext.define('PVE.dc.Guests', { var me = this; me.getComponent('qemu').update(qemu); me.getComponent('lxc').update(lxc); - me.getComponent('error').update({num: error}); + me.getComponent('error').update({ num: error }); }, }); diff --git a/www/manager6/dc/Health.js b/www/manager6/dc/Health.js index e6234a6c..ec7d3497 100644 --- a/www/manager6/dc/Health.js +++ b/www/manager6/dc/Health.js @@ -15,7 +15,7 @@ Ext.define('PVE.dc.Health', { flex: 1, xtype: 'box', style: { - 'text-align':'center', + 'text-align': 'center', }, }, @@ -46,7 +46,7 @@ Ext.define('PVE.dc.Health', { var item = records[i]; if (item.data.type === 'node') { nodes[item.data.online === 1 ? 'online':'offline']++; - } else if(item.data.type === 'cluster') { + } else if (item.data.type === 'cluster') { cluster.text = gettext("Cluster") + ": "; cluster.text += item.data.name + ", "; cluster.text += gettext("Quorate") + ": "; @@ -71,7 +71,6 @@ Ext.define('PVE.dc.Health', { var me = this; var cephstatus = me.getComponent('ceph'); if (!success || records.length < 1) { - // if ceph status is already visible // don't stop to update if (cephstatus.isVisible()) { @@ -142,7 +141,7 @@ Ext.define('PVE.dc.Health', { element: 'el', click: function() { var sp = Ext.state.Manager.getProvider(); - sp.set('dctab', {value:'ceph'}, true); + sp.set('dctab', { value: 'ceph' }, true); }, }, }, diff --git a/www/manager6/dc/Log.js b/www/manager6/dc/Log.js index 6f7ce4f7..499e2010 100644 --- a/www/manager6/dc/Log.js +++ b/www/manager6/dc/Log.js @@ -7,7 +7,7 @@ Ext.define('PVE.dc.Log', { alias: ['widget.pveClusterLog'], - initComponent : function() { + initComponent: function() { var me = this; var logstore = Ext.create('Proxmox.data.UpdateStore', { diff --git a/www/manager6/dc/NodeView.js b/www/manager6/dc/NodeView.js index 1adc2d69..f1d6ed15 100644 --- a/www/manager6/dc/NodeView.js +++ b/www/manager6/dc/NodeView.js @@ -26,7 +26,7 @@ Ext.define('PVE.dc.NodeView', { dataIndex: 'online', renderer: function(value) { var cls = (value)?'good':'critical'; - return ''; + return ''; }, }, { @@ -78,7 +78,7 @@ Ext.define('PVE.dc.NodeView', { tools: [ { type: 'up', - handler: function(){ + handler: function() { var me = this.up('grid'); var height = Math.max(me.getHeight()-50, 250); me.setHeight(height); @@ -86,7 +86,7 @@ Ext.define('PVE.dc.NodeView', { }, { type: 'down', - handler: function(){ + handler: function() { var me = this.up('grid'); var height = me.getHeight()+50; me.setHeight(height); @@ -94,13 +94,11 @@ Ext.define('PVE.dc.NodeView', { }, ], }, function() { - Ext.define('pve-dc-nodes', { extend: 'Ext.data.Model', - fields: [ 'id', 'type', 'name', 'nodeid', 'ip', 'level', 'local', 'online'], + fields: ['id', 'type', 'name', 'nodeid', 'ip', 'level', 'local', 'online'], idProperty: 'id', }); - }); Ext.define('PVE.widget.ProgressBar', { @@ -112,7 +110,7 @@ Ext.define('PVE.widget.ProgressBar', { '{percent}%', ], - setValue: function(value){ + setValue: function(value) { var me = this; me.callParent([value]); diff --git a/www/manager6/dc/OptionView.js b/www/manager6/dc/OptionView.js index 2893b901..a5232567 100644 --- a/www/manager6/dc/OptionView.js +++ b/www/manager6/dc/OptionView.js @@ -65,7 +65,7 @@ Ext.define('PVE.dc.OptionView', { .join(','); }, - initComponent : function() { + initComponent: function() { var me = this; var caps = Ext.state.Manager.get('GuiCap'); @@ -130,7 +130,7 @@ Ext.define('PVE.dc.OptionView', { deleteEmpty: false, value: '__default__', comboItems: [ - ['__default__', Proxmox.Utils.defaultText + ' (conditional)' ], + ['__default__', Proxmox.Utils.defaultText + ' (conditional)'], ['freeze', 'freeze'], ['failover', 'failover'], ['migrate', 'migrate'], diff --git a/www/manager6/dc/PoolView.js b/www/manager6/dc/PoolView.js index ea42f343..0130f5fa 100644 --- a/www/manager6/dc/PoolView.js +++ b/www/manager6/dc/PoolView.js @@ -8,7 +8,7 @@ Ext.define('PVE.dc.PoolView', { stateful: true, stateId: 'grid-pools', - initComponent : function() { + initComponent: function() { var me = this; var store = new Ext.data.Store({ @@ -28,7 +28,7 @@ Ext.define('PVE.dc.PoolView', { var remove_btn = Ext.create('Proxmox.button.StdRemoveButton', { selModel: sm, baseurl: '/pools/', - callback: function () { + callback: function() { reload(); }, }); diff --git a/www/manager6/dc/RoleEdit.js b/www/manager6/dc/RoleEdit.js index 2770a93f..c8658647 100644 --- a/www/manager6/dc/RoleEdit.js +++ b/www/manager6/dc/RoleEdit.js @@ -4,7 +4,7 @@ Ext.define('PVE.dc.RoleEdit', { width: 400, - initComponent : function() { + initComponent: function() { var me = this; me.isCreate = !me.roleid; diff --git a/www/manager6/dc/RoleView.js b/www/manager6/dc/RoleView.js index 858ebc13..d022d121 100644 --- a/www/manager6/dc/RoleView.js +++ b/www/manager6/dc/RoleView.js @@ -8,7 +8,7 @@ Ext.define('PVE.dc.RoleView', { stateful: true, stateId: 'grid-roles', - initComponent : function() { + initComponent: function() { var me = this; var store = new Ext.data.Store({ @@ -20,7 +20,6 @@ Ext.define('PVE.dc.RoleView', { }); var render_privs = function(value, metaData) { - if (!value) { return '-'; } diff --git a/www/manager6/dc/SecurityGroups.js b/www/manager6/dc/SecurityGroups.js index e0a91a18..289c92c9 100644 --- a/www/manager6/dc/SecurityGroups.js +++ b/www/manager6/dc/SecurityGroups.js @@ -1,7 +1,7 @@ Ext.define('pve-security-groups', { extend: 'Ext.data.Model', - fields: [ 'group', 'comment', 'digest' ], + fields: ['group', 'comment', 'digest'], idProperty: 'group', }); @@ -12,7 +12,7 @@ Ext.define('PVE.SecurityGroupEdit', { allow_iface: false, - initComponent : function() { + initComponent: function() { var me = this; me.isCreate = (me.group_name === undefined); @@ -58,7 +58,7 @@ Ext.define('PVE.SecurityGroupEdit', { Ext.apply(me, { subject: subject, - items: [ ipanel ], + items: [ipanel], }); me.callParent(); @@ -161,7 +161,7 @@ Ext.define('PVE.SecurityGroupList', { Ext.apply(me, { store: store, - tbar: [ '' + gettext('Group') + ':', me.addBtn, me.removeBtn, me.editBtn ], + tbar: ['' + gettext('Group') + ':', me.addBtn, me.removeBtn, me.editBtn], selModel: sm, columns: [ { header: gettext('Group'), dataIndex: 'group', width: '100' }, @@ -214,7 +214,7 @@ Ext.define('PVE.SecurityGroups', { Ext.apply(me, { layout: 'border', - items: [ sglist, rule_panel ], + items: [sglist, rule_panel], listeners: { show: function() { sglist.fireEvent('show', sglist); diff --git a/www/manager6/dc/StorageView.js b/www/manager6/dc/StorageView.js index d2026985..8d167e79 100644 --- a/www/manager6/dc/StorageView.js +++ b/www/manager6/dc/StorageView.js @@ -26,7 +26,7 @@ Ext.define('PVE.dc.StorageView', { }); }, - initComponent : function() { + initComponent: function() { var me = this; var store = new Ext.data.Store({ @@ -82,7 +82,7 @@ Ext.define('PVE.dc.StorageView', { continue; } addMenuItems.push({ - text: PVE.Utils.format_storage_type(type), + text: PVE.Utils.format_storage_type(type), iconCls: 'fa fa-fw fa-' + storage.faIcon, handler: addHandleGenerator(type), }); @@ -168,15 +168,13 @@ Ext.define('PVE.dc.StorageView', { me.callParent(); }, }, function() { - Ext.define('pve-storage', { extend: 'Ext.data.Model', fields: [ 'path', 'type', 'content', 'server', 'portal', 'target', 'export', 'storage', - { name: 'shared', type: 'boolean'}, - { name: 'disable', type: 'boolean'}, + { name: 'shared', type: 'boolean' }, + { name: 'disable', type: 'boolean' }, ], idProperty: 'storage', }); - }); diff --git a/www/manager6/dc/Summary.js b/www/manager6/dc/Summary.js index b01f05ba..a6acc964 100644 --- a/www/manager6/dc/Summary.js +++ b/www/manager6/dc/Summary.js @@ -32,7 +32,7 @@ Ext.define('PVE.dc.Summary', { xtype: 'proxmoxGauge', flex: 1, }, - items:[ + items: [ { title: gettext('CPU'), itemId: 'cpu', @@ -131,7 +131,7 @@ Ext.define('PVE.dc.Summary', { var total = 0; var usableStorages = {}; var storages = sp.get('dash-storages') || ''; - storages.split(',').forEach(function(storage){ + storages.split(',').forEach(function(storage) { if (storage !== '') { usableStorages[storage] = true; } @@ -155,7 +155,7 @@ Ext.define('PVE.dc.Summary', { for (i = 0; i < results.length; i++) { var item = results[i]; - switch(item.data.type) { + switch (item.data.type) { case 'node': cpu += (item.data.cpu * item.data.maxcpu); maxcpu += item.data.maxcpu || 0; @@ -283,7 +283,7 @@ Ext.define('PVE.dc.Summary', { subs.setData(data); }); - me.on('destroy', function(){ + me.on('destroy', function() { rstore.stopUpdate(); }); diff --git a/www/manager6/dc/Tasks.js b/www/manager6/dc/Tasks.js index ae7c3dc8..c244bd2e 100644 --- a/www/manager6/dc/Tasks.js +++ b/www/manager6/dc/Tasks.js @@ -7,7 +7,7 @@ Ext.define('PVE.dc.Tasks', { alias: ['widget.pveClusterTasks'], - initComponent : function() { + initComponent: function() { var me = this; var taskstore = Ext.create('Proxmox.data.UpdateStore', { @@ -25,11 +25,11 @@ Ext.define('PVE.dc.Tasks', { appendAtStart: true, sorters: [ { - property : 'pid', + property: 'pid', direction: 'DESC', }, { - property : 'starttime', + property: 'starttime', direction: 'DESC', }, ], @@ -85,9 +85,9 @@ Ext.define('PVE.dc.Tasks', { if (record.data.type == "vncproxy" || record.data.type == "vncshell" || record.data.type == "spiceproxy") { - metaData.tdCls = "x-grid-row-console"; + metaData.tdCls = "x-grid-row-console"; } else { - metaData.tdCls = "x-grid-row-loading"; + metaData.tdCls = "x-grid-row-loading"; } return ""; } @@ -118,7 +118,7 @@ Ext.define('PVE.dc.Tasks', { renderer: function(value, metaData, record) { if (record.data.pid) { if (record.data.type != "vncproxy") { - metaData.tdCls = "x-grid-row-loading"; + metaData.tdCls = "x-grid-row-loading"; } return ""; } diff --git a/www/manager6/dc/UserEdit.js b/www/manager6/dc/UserEdit.js index ae2882ff..f00a46f8 100644 --- a/www/manager6/dc/UserEdit.js +++ b/www/manager6/dc/UserEdit.js @@ -4,7 +4,7 @@ Ext.define('PVE.dc.UserEdit', { isAdd: true, - initComponent : function() { + initComponent: function() { var me = this; me.isCreate = !me.userid; @@ -63,7 +63,6 @@ Ext.define('PVE.dc.UserEdit', { verifypw.setVisible(false); verifypw.setDisabled(true); } - }; var column1 = [ @@ -126,7 +125,7 @@ Ext.define('PVE.dc.UserEdit', { matchFieldWidth: false, listConfig: { width: 300 }, listeners: { - change: function(combo, newValue){ + change: function(combo, newValue) { realm = newValue; update_passwd_field(realm); }, @@ -172,7 +171,7 @@ Ext.define('PVE.dc.UserEdit', { fieldDefaults: { labelWidth: 110, // for spanish translation }, - items: [ ipanel ], + items: [ipanel], }); me.callParent(); @@ -183,7 +182,7 @@ Ext.define('PVE.dc.UserEdit', { var data = response.result.data; me.setValues(data); if (data.keys) { - if ( data.keys === 'x!oath' || data.keys === 'x!u2f' ) { + if (data.keys === 'x!oath' || data.keys === 'x!u2f') { me.down('[name="keys"]').setDisabled(1); } } diff --git a/www/manager6/dc/UserView.js b/www/manager6/dc/UserView.js index 11a89edd..35c7da8b 100644 --- a/www/manager6/dc/UserView.js +++ b/www/manager6/dc/UserView.js @@ -8,7 +8,7 @@ Ext.define('PVE.dc.UserView', { stateful: true, stateId: 'grid-users', - initComponent : function() { + initComponent: function() { var me = this; var caps = Ext.state.Manager.get('GuiCap'); diff --git a/www/manager6/form/BandwidthSelector.js b/www/manager6/form/BandwidthSelector.js index de99586f..4ae52f9d 100644 --- a/www/manager6/form/BandwidthSelector.js +++ b/www/manager6/form/BandwidthSelector.js @@ -2,7 +2,7 @@ Ext.define('PVE.form.BandwidthField', { extend: 'Ext.form.FieldContainer', alias: 'widget.pveBandwidthField', - mixins: ['Proxmox.Mixin.CBind' ], + mixins: ['Proxmox.Mixin.CBind'], viewModel: { data: { @@ -67,7 +67,7 @@ Ext.define('PVE.form.BandwidthField', { }, getSubmitValue: function() { let v = this.processRawValue(this.getRawValue()); - v = v.replace(this.decimalSeparator, '.') + v = v.replace(this.decimalSeparator, '.'); if (v === undefined) return null; // FIXME: make it configurable, as this only works if 0 === default @@ -85,7 +85,7 @@ Ext.define('PVE.form.BandwidthField', { listeners: { // our setValue gets only called if we have a value, avoid // transformation of the first user-entered value - keydown: function () { this._transformed = true; }, + keydown: function() { this._transformed = true; }, }, }, { diff --git a/www/manager6/form/BridgeSelector.js b/www/manager6/form/BridgeSelector.js index e3f57f7c..6e08741e 100644 --- a/www/manager6/form/BridgeSelector.js +++ b/www/manager6/form/BridgeSelector.js @@ -5,11 +5,11 @@ Ext.define('PVE.form.BridgeSelector', { bridgeType: 'any_bridge', // bridge, OVSBridge or any_bridge store: { - fields: [ 'iface', 'active', 'type' ], + fields: ['iface', 'active', 'type'], filterOnLoad: true, sorters: [ { - property : 'iface', + property: 'iface', direction: 'ASC', }, ], diff --git a/www/manager6/form/CPUModelSelector.js b/www/manager6/form/CPUModelSelector.js index c04adc60..78ec422c 100644 --- a/www/manager6/form/CPUModelSelector.js +++ b/www/manager6/form/CPUModelSelector.js @@ -1,10 +1,10 @@ Ext.define('PVE.data.CPUModel', { extend: 'Ext.data.Model', fields: [ - {name: 'name'}, - {name: 'vendor'}, - {name: 'custom'}, - {name: 'displayname'}, + { name: 'name' }, + { name: 'vendor' }, + { name: 'custom' }, + { name: 'displayname' }, ], }); diff --git a/www/manager6/form/CalendarEvent.js b/www/manager6/form/CalendarEvent.js index 0bd3fc1e..8072eaaa 100644 --- a/www/manager6/form/CalendarEvent.js +++ b/www/manager6/form/CalendarEvent.js @@ -9,14 +9,14 @@ Ext.define('PVE.form.CalendarEvent', { queryMode: 'local', store: { - field: [ 'value', 'text'], + field: ['value', 'text'], data: [ { value: '*/30', text: Ext.String.format(gettext("Every {0} minutes"), 30) }, - { value: '*/2:00', text: gettext("Every two hours")}, - { value: '2,22:30', text: gettext("Every day") + " 02:30, 22:30"}, - { value: 'mon..fri', text: gettext("Monday to Friday") + " 00:00"}, - { value: 'mon..fri */1:00', text: gettext("Monday to Friday") + ': ' + gettext("hourly")}, - { value: 'sun 01:00', text: gettext("Sunday") + " 01:00"}, + { value: '*/2:00', text: gettext("Every two hours") }, + { value: '2,22:30', text: gettext("Every day") + " 02:30, 22:30" }, + { value: 'mon..fri', text: gettext("Monday to Friday") + " 00:00" }, + { value: 'mon..fri */1:00', text: gettext("Monday to Friday") + ': ' + gettext("hourly") }, + { value: 'sun 01:00', text: gettext("Sunday") + " 01:00" }, ], }, diff --git a/www/manager6/form/CephPoolSelector.js b/www/manager6/form/CephPoolSelector.js index 0cfbeec7..5b96398d 100644 --- a/www/manager6/form/CephPoolSelector.js +++ b/www/manager6/form/CephPoolSelector.js @@ -31,7 +31,7 @@ Ext.define('PVE.form.CephPoolSelector', { me.callParent(); store.load({ - callback: function(rec, op, success){ + callback: function(rec, op, success) { if (success && rec.length > 0) { me.select(rec[0]); } diff --git a/www/manager6/form/ControllerSelector.js b/www/manager6/form/ControllerSelector.js index f229c7ce..23c61159 100644 --- a/www/manager6/form/ControllerSelector.js +++ b/www/manager6/form/ControllerSelector.js @@ -48,7 +48,7 @@ Ext.define('PVE.form.ControllerSelector', { return; } clist = ['ide', 'scsi', 'sata']; - } else { + } else { // in most cases we want to add a disk to the same controller // we previously used clist = me.sortByPreviousUsage(me.vmconfig, clist); diff --git a/www/manager6/form/DayOfWeekSelector.js b/www/manager6/form/DayOfWeekSelector.js index 164dd5d4..a8d46246 100644 --- a/www/manager6/form/DayOfWeekSelector.js +++ b/www/manager6/form/DayOfWeekSelector.js @@ -1,8 +1,8 @@ Ext.define('PVE.form.DayOfWeekSelector', { extend: 'Proxmox.form.KVComboBox', alias: ['widget.pveDayOfWeekSelector'], - comboItems:[], - initComponent: function(){ + comboItems: [], + initComponent: function() { var me = this; me.comboItems = [ ['mon', Ext.util.Format.htmlDecode(Ext.Date.dayNames[1])], diff --git a/www/manager6/form/DiskFormatSelector.js b/www/manager6/form/DiskFormatSelector.js index bbd442cc..119a1220 100644 --- a/www/manager6/form/DiskFormatSelector.js +++ b/www/manager6/form/DiskFormatSelector.js @@ -1,7 +1,7 @@ Ext.define('PVE.form.DiskFormatSelector', { extend: 'Proxmox.form.KVComboBox', alias: 'widget.pveDiskFormatSelector', - comboItems: [ + comboItems: [ ['raw', gettext('Raw disk image') + ' (raw)'], ['qcow2', gettext('QEMU image format') + ' (qcow2)'], ['vmdk', gettext('VMware image format') + ' (vmdk)'], diff --git a/www/manager6/form/FirewallPolicySelector.js b/www/manager6/form/FirewallPolicySelector.js index a5c9d42a..c3404a2e 100644 --- a/www/manager6/form/FirewallPolicySelector.js +++ b/www/manager6/form/FirewallPolicySelector.js @@ -4,6 +4,6 @@ Ext.define('PVE.form.FirewallPolicySelector', { comboItems: [ ['ACCEPT', 'ACCEPT'], ['REJECT', 'REJECT'], - [ 'DROP', 'DROP'], + ['DROP', 'DROP'], ], }); diff --git a/www/manager6/form/GlobalSearchField.js b/www/manager6/form/GlobalSearchField.js index 19bcb6f7..f4225d9f 100644 --- a/www/manager6/form/GlobalSearchField.js +++ b/www/manager6/form/GlobalSearchField.js @@ -28,11 +28,11 @@ Ext.define('PVE.form.GlobalSearchField', { scrollable: { xtype: 'scroller', y: true, - x:false, + x: false, }, store: { model: 'PVEResources', - proxy:{ + proxy: { type: 'proxmox', url: '/api2/extjs/cluster/resources', }, @@ -125,14 +125,14 @@ Ext.define('PVE.form.GlobalSearchField', { // // results gets sorted by points (descending) fields = me.filterVal.split(/\s+/); - for(i = 0; i < fieldArr.length; i++) { + for (i = 0; i < fieldArr.length; i++) { var v = item.data[fieldArr[i]]; if (v !== undefined) { v = v.toString().toLowerCase(); - for(j = 0; j < fields.length; j++) { + for (j = 0; j < fields.length; j++) { if (v.indexOf(fields[j]) !== -1) { match++; - if(v === fields[j]) { + if (v === fields[j]) { match++; } } @@ -166,7 +166,7 @@ Ext.define('PVE.form.GlobalSearchField', { var me = this; var key = e.getKey(); - switch(key) { + switch (key) { case Ext.event.Event.ENTER: // go to first entry if there is one if (me.grid.store.getCount() > 0) { @@ -244,13 +244,13 @@ Ext.define('PVE.form.GlobalSearchField', { me.keymap = new Ext.KeyMap({ target: Ext.get(document), binding: [{ - key:'F', + key: 'F', ctrl: true, shift: true, fn: me.toggleFocus, scope: me, }, { - key:' ', + key: ' ', ctrl: true, fn: me.toggleFocus, scope: me, diff --git a/www/manager6/form/GroupSelector.js b/www/manager6/form/GroupSelector.js index 34e5e905..90fa1827 100644 --- a/www/manager6/form/GroupSelector.js +++ b/www/manager6/form/GroupSelector.js @@ -1,6 +1,6 @@ Ext.define('pve-groups', { extend: 'Ext.data.Model', - fields: [ 'groupid', 'comment', 'users' ], + fields: ['groupid', 'comment', 'users'], proxy: { type: 'proxmox', url: "/api2/json/access/groups", diff --git a/www/manager6/form/HotplugFeatureSelector.js b/www/manager6/form/HotplugFeatureSelector.js index 75cd7cc7..cb9fc552 100644 --- a/www/manager6/form/HotplugFeatureSelector.js +++ b/www/manager6/form/HotplugFeatureSelector.js @@ -52,7 +52,7 @@ Ext.define('PVE.form.HotplugFeatureSelector', { var me = this, boxes = me.getBoxes(), data = []; - Ext.Array.forEach(boxes, function(box){ + Ext.Array.forEach(boxes, function(box) { if (box.getValue()) { data.push(box.inputValue); } @@ -60,7 +60,7 @@ Ext.define('PVE.form.HotplugFeatureSelector', { /* because above is hotplug an array */ if (data.length === 0) { - return { 'hotplug':'0' }; + return { 'hotplug': '0' }; } else { return { 'hotplug': data.join(',') }; } diff --git a/www/manager6/form/IPProtocolSelector.js b/www/manager6/form/IPProtocolSelector.js index 35da9b28..84ba47ed 100644 --- a/www/manager6/form/IPProtocolSelector.js +++ b/www/manager6/form/IPProtocolSelector.js @@ -29,12 +29,12 @@ Ext.define('PVE.form.IPProtocolSelector', { ], }, store: { - fields: [ 'p', 'd', 'n'], + fields: ['p', 'd', 'n'], data: [ { p: 'tcp', n: 6, d: 'Transmission Control Protocol' }, { p: 'udp', n: 17, d: 'User Datagram Protocol' }, { p: 'icmp', n: 1, d: 'Internet Control Message Protocol' }, - { p: 'igmp', n: 2, d: 'Internet Group Management' }, + { p: 'igmp', n: 2, d: 'Internet Group Management' }, { p: 'ggp', n: 3, d: 'gateway-gateway protocol' }, { p: 'ipencap', n: 4, d: 'IP encapsulated in IP' }, { p: 'st', n: 5, d: 'ST datagram mode' }, diff --git a/www/manager6/form/IPRefSelector.js b/www/manager6/form/IPRefSelector.js index 1f3698ac..1c3bb649 100644 --- a/www/manager6/form/IPRefSelector.js +++ b/www/manager6/form/IPRefSelector.js @@ -26,7 +26,7 @@ Ext.define('PVE.form.IPRefSelector', { var store = Ext.create('Ext.data.Store', { autoLoad: true, - fields: [ 'type', 'name', 'ref', 'comment' ], + fields: ['type', 'name', 'ref', 'comment'], idProperty: 'ref', proxy: { type: 'proxmox', diff --git a/www/manager6/form/MDevSelector.js b/www/manager6/form/MDevSelector.js index 6c634272..399f7b37 100644 --- a/www/manager6/form/MDevSelector.js +++ b/www/manager6/form/MDevSelector.js @@ -3,11 +3,11 @@ Ext.define('PVE.form.MDevSelector', { xtype: 'pveMDevSelector', store: { - fields: [ 'type', 'available', 'description' ], + fields: ['type', 'available', 'description'], filterOnLoad: true, sorters: [ { - property : 'type', + property: 'type', direction: 'ASC', }, ], diff --git a/www/manager6/form/NodeSelector.js b/www/manager6/form/NodeSelector.js index aa428f3e..2a89d1d2 100644 --- a/www/manager6/form/NodeSelector.js +++ b/www/manager6/form/NodeSelector.js @@ -19,18 +19,18 @@ Ext.define('PVE.form.NodeSelector', { valueField: 'node', displayField: 'node', store: { - fields: [ 'node', 'cpu', 'maxcpu', 'mem', 'maxmem', 'uptime' ], + fields: ['node', 'cpu', 'maxcpu', 'mem', 'maxmem', 'uptime'], proxy: { type: 'proxmox', url: '/api2/json/nodes', }, sorters: [ { - property : 'node', + property: 'node', direction: 'ASC', }, { - property : 'mem', + property: 'mem', direction: 'DESC', }, ], @@ -111,7 +111,7 @@ Ext.define('PVE.form.NodeSelector', { }, })); - me.mon(me.getStore(), 'load', function(){ + me.mon(me.getStore(), 'load', function() { me.isValid(); }); }, diff --git a/www/manager6/form/PCISelector.js b/www/manager6/form/PCISelector.js index 7a4fa590..fb9f84d4 100644 --- a/www/manager6/form/PCISelector.js +++ b/www/manager6/form/PCISelector.js @@ -3,11 +3,11 @@ Ext.define('PVE.form.PCISelector', { xtype: 'pvePCISelector', store: { - fields: [ 'id', 'vendor_name', 'device_name', 'vendor', 'device', 'iommugroup', 'mdev' ], + fields: ['id', 'vendor_name', 'device_name', 'vendor', 'device', 'iommugroup', 'mdev'], filterOnLoad: true, sorters: [ { - property : 'id', + property: 'id', direction: 'ASC', }, ], diff --git a/www/manager6/form/PoolSelector.js b/www/manager6/form/PoolSelector.js index 4e70b10d..3c464891 100644 --- a/www/manager6/form/PoolSelector.js +++ b/www/manager6/form/PoolSelector.js @@ -42,15 +42,13 @@ Ext.define('PVE.form.PoolSelector', { }, }, function() { - Ext.define('pve-pools', { extend: 'Ext.data.Model', - fields: [ 'poolid', 'comment' ], + fields: ['poolid', 'comment'], proxy: { type: 'proxmox', url: "/api2/json/pools", }, idProperty: 'poolid', }); - }); diff --git a/www/manager6/form/PrivilegesSelector.js b/www/manager6/form/PrivilegesSelector.js index 8a84d473..9a0f12d7 100644 --- a/www/manager6/form/PrivilegesSelector.js +++ b/www/manager6/form/PrivilegesSelector.js @@ -27,7 +27,7 @@ Ext.define('PVE.form.PrivilegesSelector', { }); }, - failure: function (response, opts) { + failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); }, }); diff --git a/www/manager6/form/SDNControllerSelector.js b/www/manager6/form/SDNControllerSelector.js index f57b15e3..19e6db53 100644 --- a/www/manager6/form/SDNControllerSelector.js +++ b/www/manager6/form/SDNControllerSelector.js @@ -38,15 +38,13 @@ Ext.define('PVE.form.SDNControllerSelector', { }, }, function() { - Ext.define('pve-sdn-controller', { extend: 'Ext.data.Model', - fields: [ 'controller' ], + fields: ['controller'], proxy: { type: 'proxmox', url: "/api2/json/cluster/sdn/controllers", }, idProperty: 'controller', }); - }); diff --git a/www/manager6/form/SDNZoneSelector.js b/www/manager6/form/SDNZoneSelector.js index b4e0d9ea..b79e95f5 100644 --- a/www/manager6/form/SDNZoneSelector.js +++ b/www/manager6/form/SDNZoneSelector.js @@ -38,15 +38,13 @@ Ext.define('PVE.form.SDNZoneSelector', { }, }, function() { - Ext.define('pve-sdn-zone', { extend: 'Ext.data.Model', - fields: [ 'zone' ], + fields: ['zone'], proxy: { type: 'proxmox', url: "/api2/json/cluster/sdn/zones", }, idProperty: 'zone', }); - }); diff --git a/www/manager6/form/SecurityGroupSelector.js b/www/manager6/form/SecurityGroupSelector.js index 83db8b66..5eee703e 100644 --- a/www/manager6/form/SecurityGroupSelector.js +++ b/www/manager6/form/SecurityGroupSelector.js @@ -9,7 +9,7 @@ Ext.define('PVE.form.SecurityGroupsSelector', { var store = Ext.create('Ext.data.Store', { autoLoad: true, - fields: [ 'group', 'comment' ], + fields: ['group', 'comment'], idProperty: 'group', proxy: { type: 'proxmox', diff --git a/www/manager6/form/SnapshotSelector.js b/www/manager6/form/SnapshotSelector.js index 8c9e9217..4155269b 100644 --- a/www/manager6/form/SnapshotSelector.js +++ b/www/manager6/form/SnapshotSelector.js @@ -44,7 +44,7 @@ Ext.define('PVE.form.SnapshotSelector', { } var store = Ext.create('Ext.data.Store', { - fields: [ 'name'], + fields: ['name'], filterOnLoad: true, }); diff --git a/www/manager6/form/StorageSelector.js b/www/manager6/form/StorageSelector.js index b1f2d0c5..ea4a0744 100644 --- a/www/manager6/form/StorageSelector.js +++ b/www/manager6/form/StorageSelector.js @@ -58,7 +58,6 @@ Ext.define('PVE.form.StorageSelector', { }); me.store.load(); - }, setTargetNode: function(targetNode) { @@ -110,11 +109,9 @@ Ext.define('PVE.form.StorageSelector', { } }, }, function() { - Ext.define('pve-storage-status', { extend: 'Ext.data.Model', - fields: [ 'storage', 'active', 'type', 'avail', 'total' ], + fields: ['storage', 'active', 'type', 'avail', 'total'], idProperty: 'storage', }); - }); diff --git a/www/manager6/form/USBSelector.js b/www/manager6/form/USBSelector.js index 4dcfe39a..4fef6d34 100644 --- a/www/manager6/form/USBSelector.js +++ b/www/manager6/form/USBSelector.js @@ -43,7 +43,7 @@ Ext.define('PVE.form.USBSelector', { url: `/api2/json/nodes/${nodename}/hardware/usb`, }, filters: [ - function (item) { + function(item) { return !!item.data.usbpath && !!item.data.prodid && item.data['class'] != 9; }, ], @@ -86,10 +86,10 @@ Ext.define('PVE.form.USBSelector', { dataIndex: 'speed', renderer: function(value) { let speed_map = { - "10000" : "USB 3.1", - "5000" : "USB 3.0", - "480" : "USB 2.0", - "12" : "USB 1.x", + "10000": "USB 3.1", + "5000": "USB 3.0", + "480": "USB 2.0", + "12": "USB 1.x", "1.5": "USB 1.x", }; return speed_map[value] || value + " Mbps"; @@ -105,7 +105,6 @@ Ext.define('PVE.form.USBSelector', { }, }, function() { - Ext.define('pve-usb-device', { extend: 'Ext.data.Model', fields: [ diff --git a/www/manager6/form/UserSelector.js b/www/manager6/form/UserSelector.js index f30a346c..2d4c8c22 100644 --- a/www/manager6/form/UserSelector.js +++ b/www/manager6/form/UserSelector.js @@ -52,11 +52,10 @@ Ext.define('PVE.form.UserSelector', { me.callParent(); - store.load({ params: { enabled: 1 }}); + store.load({ params: { enabled: 1 } }); }, }, function() { - Ext.define('pve-users', { extend: 'Ext.data.Model', fields: [ @@ -70,7 +69,6 @@ Ext.define('PVE.form.UserSelector', { }, idProperty: 'userid', }); - }); diff --git a/www/manager6/form/VMCPUFlagSelector.js b/www/manager6/form/VMCPUFlagSelector.js index 06760ef3..81874a42 100644 --- a/www/manager6/form/VMCPUFlagSelector.js +++ b/www/manager6/form/VMCPUFlagSelector.js @@ -98,7 +98,7 @@ Ext.define('PVE.form.VMCPUFlagSelector', { { dataIndex: 'state', renderer: function(v) { - switch(v) { + switch (v) { case '=': return 'Default'; case '-': return 'Off'; case '+': return 'On'; @@ -111,7 +111,7 @@ Ext.define('PVE.form.VMCPUFlagSelector', { xtype: 'widgetcolumn', dataIndex: 'state', width: 95, - onWidgetAttach: function (column, widget, record) { + onWidgetAttach: function(column, widget, record) { var val = record.get('state') || '='; widget.down('[inputValue=' + val + ']').setValue(true); // TODO: disable if selected CPU model and flag are incompatible diff --git a/www/manager6/form/VMSelector.js b/www/manager6/form/VMSelector.js index 7aca5613..6a51a73d 100644 --- a/www/manager6/form/VMSelector.js +++ b/www/manager6/form/VMSelector.js @@ -74,14 +74,14 @@ Ext.define('PVE.form.VMSelector', { type: 'list', store: { data: [ - {id: 'qemu', text: gettext('Virtual Machine')}, - {id: 'lxc', text: gettext('LXC Container')}, + { id: 'qemu', text: gettext('Virtual Machine') }, + { id: 'lxc', text: gettext('LXC Container') }, ], // due to EXTJS-18711 // we have to do a static list via a store // but to avoid creating an object, // we have to have a pseudo un function - un: function(){}, + un: function() {}, }, }, }, @@ -154,7 +154,7 @@ Ext.define('PVE.form.VMSelector', { getErrors: function(value) { var me = this; - if (me.allowBlank === false && + if (me.allowBlank === false && me.getSelectionModel().getCount() === 0) { me.addBodyCls(['x-form-trigger-wrap-default', 'x-form-trigger-wrap-invalid']); return [gettext('No VM selected')]; @@ -205,7 +205,7 @@ Ext.define('PVE.form.VMSelector', { var sm = me.getSelectionModel(); if (me.selectAll) { - me.mon(store, 'load', function(){ + me.mon(store, 'load', function() { me.getSelectionModel().selectAll(false); }); } @@ -291,10 +291,10 @@ Ext.define('PVE.form.VMComboSelector', { type: 'list', store: { data: [ - {id: 'qemu', text: gettext('Virtual Machine')}, - {id: 'lxc', text: gettext('LXC Container')}, + { id: 'qemu', text: gettext('Virtual Machine') }, + { id: 'lxc', text: gettext('LXC Container') }, ], - un: function(){}, // due to EXTJS-18711 + un: function() {}, // due to EXTJS-18711 }, }, }, diff --git a/www/manager6/form/ViewSelector.js b/www/manager6/form/ViewSelector.js index 7d92c7b0..d744b319 100644 --- a/www/manager6/form/ViewSelector.js +++ b/www/manager6/form/ViewSelector.js @@ -71,7 +71,7 @@ Ext.define('PVE.form.ViewSelector', { return { value: me.getValue() }; }, - applyState : function(state, doSelect) { + applyState: function(state, doSelect) { var view = me.getValue(); if (state && state.value && (view != state.value)) { var record = store.findRecord('key', state.value, 0, false, true, true); @@ -83,7 +83,7 @@ Ext.define('PVE.form.ViewSelector', { } } }, - stateEvents: [ 'select' ], + stateEvents: ['select'], stateful: true, stateId: 'pveview', id: 'view', diff --git a/www/manager6/form/iScsiProviderSelector.js b/www/manager6/form/iScsiProviderSelector.js index c7129f8b..dfbd9628 100644 --- a/www/manager6/form/iScsiProviderSelector.js +++ b/www/manager6/form/iScsiProviderSelector.js @@ -3,8 +3,8 @@ Ext.define('PVE.form.iScsiProviderSelector', { alias: ['widget.pveiScsiProviderSelector'], comboItems: [ ['comstar', 'Comstar'], - [ 'istgt', 'istgt'], - [ 'iet', 'IET'], - [ 'LIO', 'LIO'], + ['istgt', 'istgt'], + ['iet', 'IET'], + ['LIO', 'LIO'], ], }); diff --git a/www/manager6/grid/BackupView.js b/www/manager6/grid/BackupView.js index d7036abd..2a496fab 100644 --- a/www/manager6/grid/BackupView.js +++ b/www/manager6/grid/BackupView.js @@ -8,7 +8,7 @@ Ext.define('PVE.grid.BackupView', { stateful: true, stateId: 'grid-guest-backup', - initComponent : function() { + initComponent: function() { var me = this; var nodename = me.pveSelNode.data.node; @@ -152,7 +152,7 @@ Ext.define('PVE.grid.BackupView', { vmid: vmid, vmtype: vmtype, storage: storagesel.getValue(), - listeners : { + listeners: { close: function() { reload(); }, diff --git a/www/manager6/grid/FirewallAliases.js b/www/manager6/grid/FirewallAliases.js index 16690304..0281e99d 100644 --- a/www/manager6/grid/FirewallAliases.js +++ b/www/manager6/grid/FirewallAliases.js @@ -7,8 +7,7 @@ Ext.define('PVE.FirewallAliasEdit', { width: 400, - initComponent : function() { - + initComponent: function() { var me = this; me.isCreate = (me.alias_name === undefined); @@ -21,7 +20,7 @@ Ext.define('PVE.FirewallAliasEdit', { me.method = 'PUT'; } - var items = [ + var items = [ { xtype: 'textfield', name: me.isCreate ? 'name' : 'rename', @@ -49,7 +48,7 @@ Ext.define('PVE.FirewallAliasEdit', { Ext.apply(me, { subject: gettext('Alias'), isAdd: true, - items: [ ipanel ], + items: [ipanel], }); me.callParent(); @@ -69,7 +68,7 @@ Ext.define('PVE.FirewallAliasEdit', { Ext.define('pve-fw-aliases', { extend: 'Ext.data.Model', - fields: [ 'name', 'cidr', 'comment', 'digest' ], + fields: ['name', 'cidr', 'comment', 'digest'], idProperty: 'name', }); @@ -86,8 +85,7 @@ Ext.define('PVE.FirewallAliases', { title: gettext('Alias'), - initComponent : function() { - + initComponent: function() { var me = this; if (!me.base_url) { @@ -143,7 +141,7 @@ Ext.define('PVE.FirewallAliases', { handler: run_editor, }); - me.addBtn = Ext.create('Ext.Button', { + me.addBtn = Ext.create('Ext.Button', { text: gettext('Add'), handler: function() { var win = Ext.create('PVE.FirewallAliasEdit', { @@ -163,7 +161,7 @@ Ext.define('PVE.FirewallAliases', { Ext.apply(me, { store: store, - tbar: [ me.addBtn, me.removeBtn, me.editBtn ], + tbar: [me.addBtn, me.removeBtn, me.editBtn], selModel: sm, columns: [ { @@ -172,7 +170,7 @@ Ext.define('PVE.FirewallAliases', { flex: 1, }, { - header: gettext('IP/CIDR'), + header: gettext('IP/CIDR'), dataIndex: 'cidr', flex: 1, }, diff --git a/www/manager6/grid/FirewallOptions.js b/www/manager6/grid/FirewallOptions.js index e6088183..4123bd9f 100644 --- a/www/manager6/grid/FirewallOptions.js +++ b/www/manager6/grid/FirewallOptions.js @@ -6,8 +6,7 @@ Ext.define('PVE.FirewallOptions', { base_url: undefined, - initComponent : function() { - + initComponent: function() { var me = this; if (!me.base_url) { @@ -167,7 +166,7 @@ Ext.define('PVE.FirewallOptions', { Ext.apply(me, { url: "/api2/json" + me.base_url, - tbar: [ edit_btn ], + tbar: [edit_btn], editorConfig: { url: '/api2/extjs/' + me.base_url, }, diff --git a/www/manager6/grid/FirewallRules.js b/www/manager6/grid/FirewallRules.js index af71ad63..d0d804c9 100644 --- a/www/manager6/grid/FirewallRules.js +++ b/www/manager6/grid/FirewallRules.js @@ -26,7 +26,7 @@ Ext.define('PVE.form.FWMacroSelector', { var store = Ext.create('Ext.data.Store', { autoLoad: true, - fields: [ 'macro', 'descr' ], + fields: ['macro', 'descr'], idProperty: 'macro', proxy: { type: 'proxmox', @@ -70,7 +70,7 @@ Ext.define('PVE.FirewallRulePanel', { return values; }, - initComponent : function() { + initComponent: function() { var me = this; if (!me.list_refs_url) { @@ -235,8 +235,7 @@ Ext.define('PVE.FirewallRuleEdit', { allow_iface: false, - initComponent : function() { - + initComponent: function() { var me = this; if (!me.base_url) { @@ -266,7 +265,7 @@ Ext.define('PVE.FirewallRuleEdit', { Ext.apply(me, { subject: gettext('Rule'), isAdd: true, - items: [ ipanel ], + items: [ipanel], }); me.callParent(); @@ -299,8 +298,7 @@ Ext.define('PVE.FirewallGroupRuleEdit', { allow_iface: false, - initComponent : function() { - + initComponent: function() { var me = this; me.isCreate = (me.rule_pos === undefined); @@ -363,14 +361,14 @@ Ext.define('PVE.FirewallGroupRuleEdit', { Ext.apply(me, { subject: gettext('Rule'), isAdd: true, - items: [ ipanel ], + items: [ipanel], }); me.callParent(); if (!me.isCreate) { me.load({ - success: function(response, options) { + success: function(response, options) { var values = response.result.data; ipanel.setValues(values); }, @@ -528,7 +526,7 @@ Ext.define('PVE.FirewallRules', { handler: run_editor, }); - me.addBtn = Ext.create('Ext.Button', { + me.addBtn = Ext.create('Ext.Button', { text: gettext('Add'), disabled: true, handler: function() { @@ -577,7 +575,7 @@ Ext.define('PVE.FirewallRules', { }); if (me.allow_groups) { - me.groupBtn = Ext.create('Ext.Button', { + me.groupBtn = Ext.create('Ext.Button', { text: gettext('Insert') + ': ' + gettext('Security Group'), disabled: true, @@ -606,7 +604,7 @@ Ext.define('PVE.FirewallRules', { }, }); - var tbar = me.tbar_prefix ? [ me.tbar_prefix ] : []; + var tbar = me.tbar_prefix ? [me.tbar_prefix] : []; tbar.push(me.addBtn, me.copyBtn); if (me.groupBtn) { tbar.push(me.groupBtn); @@ -617,7 +615,7 @@ Ext.define('PVE.FirewallRules', { var errors = record.data.errors; if (errors && errors[name]) { metaData.tdCls = 'proxmox-invalid-row'; - var html = '

' + Ext.htmlEncode(errors[name]) + '

'; + var html = '

' + Ext.htmlEncode(errors[name]) + '

'; metaData.tdAttr = 'data-qwidth=600 data-qtitle="ERROR" data-qtip="' + html.replace(/\"/g, '"') + '"'; } @@ -797,13 +795,11 @@ Ext.define('PVE.FirewallRules', { } }, }, function() { - Ext.define('pve-fw-rule', { extend: 'Ext.data.Model', - fields: [ { name: 'enable', type: 'boolean' }, + fields: [{ name: 'enable', type: 'boolean' }, 'type', 'action', 'macro', 'source', 'dest', 'proto', 'iface', - 'dport', 'sport', 'comment', 'pos', 'digest', 'errors' ], + 'dport', 'sport', 'comment', 'pos', 'digest', 'errors'], idProperty: 'pos', }); - }); diff --git a/www/manager6/grid/PoolMembers.js b/www/manager6/grid/PoolMembers.js index a20afc30..4be2267c 100644 --- a/www/manager6/grid/PoolMembers.js +++ b/www/manager6/grid/PoolMembers.js @@ -4,8 +4,7 @@ Ext.define('PVE.pool.AddVM', { height: 400, isAdd: true, isCreate: true, - initComponent : function() { - + initComponent: function() { var me = this; if (!me.pool) { @@ -88,7 +87,7 @@ Ext.define('PVE.pool.AddVM', { }); Ext.apply(me, { subject: gettext('Virtual Machine'), - items: [ vmsField, vmGrid ], + items: [vmsField, vmGrid], }); me.callParent(); @@ -99,8 +98,7 @@ Ext.define('PVE.pool.AddVM', { Ext.define('PVE.pool.AddStorage', { extend: 'Proxmox.window.Edit', - initComponent : function() { - + initComponent: function() { var me = this; if (!me.pool) { @@ -121,7 +119,7 @@ Ext.define('PVE.pool.AddStorage', { name: 'storage', nodename: 'localhost', autoSelect: false, - value: '', + value: '', fieldLabel: gettext("Storage"), }, ], @@ -140,7 +138,7 @@ Ext.define('PVE.grid.PoolMembers', { stateful: true, stateId: 'grid-pool-members', - initComponent : function() { + initComponent: function() { var me = this; if (!me.pool) { @@ -151,7 +149,7 @@ Ext.define('PVE.grid.PoolMembers', { model: 'PVEResources', sorters: [ { - property : 'type', + property: 'type', direction: 'ASC', }, ], @@ -174,7 +172,7 @@ Ext.define('PVE.grid.PoolMembers', { text: gettext('Remove'), disabled: true, selModel: sm, - confirmMsg: function (rec) { + confirmMsg: function(rec) { return Ext.String.format(gettext('Are you sure you want to remove entry {0}'), "'" + rec.data.id + "'"); }, @@ -196,7 +194,7 @@ Ext.define('PVE.grid.PoolMembers', { callback: function() { reload(); }, - failure: function (response, opts) { + failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); }, }); diff --git a/www/manager6/grid/Replication.js b/www/manager6/grid/Replication.js index 4f4780b0..ddc80fdd 100644 --- a/www/manager6/grid/Replication.js +++ b/www/manager6/grid/Replication.js @@ -116,7 +116,6 @@ Ext.define('PVE.window.ReplicaEdit', { me.highestids = highestids; }, }); - } else { me.load({ success: function(response, options) { @@ -176,7 +175,7 @@ Ext.define('PVE.grid.ReplicaView', { method: 'POST', waitMsgTarget: me, callback: function() { controller.reload(); }, - failure: function (response, opts) { + failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); }, }); @@ -190,7 +189,7 @@ Ext.define('PVE.grid.ReplicaView', { url: "/api2/extjs/nodes/" + me.nodename + "/replication/" + rec.data.id + "/log", }); var win = Ext.create('Ext.window.Window', { - items: [ logView ], + items: [logView], layout: 'fit', width: 800, height: 400, @@ -332,7 +331,6 @@ Ext.define('PVE.grid.ReplicaView', { minWidth: 160, flex: 1, renderer: function(value, metadata, record) { - if (record.data.pid) { metadata.tdCls = 'x-grid-row-loading'; return ''; @@ -474,7 +472,6 @@ Ext.define('PVE.grid.ReplicaView', { me.rstore.startUpdate(); }, }, function() { - Ext.define('pve-replication', { extend: 'Ext.data.Model', fields: [ @@ -494,5 +491,4 @@ Ext.define('PVE.grid.ReplicaView', { 'fail_count', 'remove_job', 'pid', ], }); - }); diff --git a/www/manager6/grid/ResourceGrid.js b/www/manager6/grid/ResourceGrid.js index 68065a0a..dd20f058 100644 --- a/www/manager6/grid/ResourceGrid.js +++ b/www/manager6/grid/ResourceGrid.js @@ -7,7 +7,7 @@ Ext.define('PVE.grid.ResourceGrid', { property: 'type', direction: 'ASC', }, - initComponent : function() { + initComponent: function() { var me = this; var rstore = PVE.data.ResourceStore; @@ -39,7 +39,6 @@ Ext.define('PVE.grid.ResourceGrid', { }; var updateGrid = function() { - var filterfn = me.viewFilter ? me.viewFilter.filterfn : null; //console.log("START GRID UPDATE " + me.viewFilter); @@ -137,7 +136,7 @@ Ext.define('PVE.grid.ResourceGrid', { //console.log("END GRID UPDATE"); }; - var filter_task = new Ext.util.DelayedTask(function(){ + var filter_task = new Ext.util.DelayedTask(function() { updateGrid(); }); diff --git a/www/manager6/ha/Fencing.js b/www/manager6/ha/Fencing.js index c9c7f2a5..c87a761c 100644 --- a/www/manager6/ha/Fencing.js +++ b/www/manager6/ha/Fencing.js @@ -4,7 +4,7 @@ Ext.define('PVE.ha.FencingView', { onlineHelp: 'ha_manager_fencing', - initComponent : function() { + initComponent: function() { var me = this; var store = new Ext.data.Store({ @@ -38,12 +38,10 @@ Ext.define('PVE.ha.FencingView', { me.callParent(); }, }, function() { - Ext.define('pve-ha-fencing', { extend: 'Ext.data.Model', fields: [ 'node', 'command', 'digest', ], }); - }); diff --git a/www/manager6/ha/GroupEdit.js b/www/manager6/ha/GroupEdit.js index c91f5d62..f1a1cc88 100644 --- a/www/manager6/ha/GroupEdit.js +++ b/www/manager6/ha/GroupEdit.js @@ -14,7 +14,7 @@ Ext.define('PVE.ha.GroupInputPanel', { return values; }, - initComponent : function() { + initComponent: function() { var me = this; var update_nodefield, update_node_selection; @@ -32,15 +32,15 @@ Ext.define('PVE.ha.GroupInputPanel', { var data = PVE.data.ResourceStore.getNodes(); var store = Ext.create('Ext.data.Store', { - fields: [ 'node', 'mem', 'cpu', 'priority' ], + fields: ['node', 'mem', 'cpu', 'priority'], data: data, proxy: { type: 'memory', - reader: {type: 'json'}, + reader: { type: 'json' }, }, sorters: [ { - property : 'node', + property: 'node', direction: 'ASC', }, ], @@ -98,11 +98,11 @@ Ext.define('PVE.ha.GroupInputPanel', { name: 'nodes', value: '', listeners: { - change: function (nodefield, value) { + change: function(nodefield, value) { update_node_selection(value); }, }, - isValid: function () { + isValid: function() { var value = nodefield.getValue(); return (value && 0 !== value.length); }, @@ -111,7 +111,7 @@ Ext.define('PVE.ha.GroupInputPanel', { update_node_selection = function(string) { sm.deselectAll(true); - string.split(',').forEach(function (e, idx, array) { + string.split(',').forEach(function(e, idx, array) { var res = e.split(':'); store.each(function(record) { @@ -125,7 +125,6 @@ Ext.define('PVE.ha.GroupInputPanel', { }); }); nodegrid.reconfigure(store); - }; update_nodefield = function(selected) { @@ -195,7 +194,7 @@ Ext.define('PVE.ha.GroupEdit', { groupId: undefined, - initComponent : function() { + initComponent: function() { var me = this; me.isCreate = !me.groupId; @@ -215,14 +214,14 @@ Ext.define('PVE.ha.GroupEdit', { Ext.apply(me, { subject: gettext('HA Group'), - items: [ ipanel ], + items: [ipanel], }); me.callParent(); if (!me.isCreate) { me.load({ - success: function(response, options) { + success: function(response, options) { var values = response.result.data; ipanel.setValues(values); diff --git a/www/manager6/ha/GroupSelector.js b/www/manager6/ha/GroupSelector.js index b1401a58..020e1eca 100644 --- a/www/manager6/ha/GroupSelector.js +++ b/www/manager6/ha/GroupSelector.js @@ -43,17 +43,16 @@ Ext.define('PVE.ha.GroupSelector', { }, }, function() { - Ext.define('pve-ha-groups', { extend: 'Ext.data.Model', fields: [ 'group', 'type', 'digest', 'nodes', 'comment', { - name : 'restricted', + name: 'restricted', type: 'boolean', }, { - name : 'nofailback', + name: 'nofailback', type: 'boolean', }, ], diff --git a/www/manager6/ha/Groups.js b/www/manager6/ha/Groups.js index 42d9c588..aa88e209 100644 --- a/www/manager6/ha/Groups.js +++ b/www/manager6/ha/Groups.js @@ -7,7 +7,7 @@ Ext.define('PVE.ha.GroupsView', { stateful: true, stateId: 'grid-ha-groups', - initComponent : function() { + initComponent: function() { var me = this; var caps = Ext.state.Manager.get('GuiCap'); diff --git a/www/manager6/ha/ResourceEdit.js b/www/manager6/ha/ResourceEdit.js index b3fc7726..8aaf49dc 100644 --- a/www/manager6/ha/ResourceEdit.js +++ b/www/manager6/ha/ResourceEdit.js @@ -18,7 +18,7 @@ Ext.define('PVE.ha.VMResourceInputPanel', { return values; }, - initComponent : function() { + initComponent: function() { var me = this; var MIN_QUORUM_VOTES = 3; @@ -126,8 +126,7 @@ Ext.define('PVE.ha.VMResourceInputPanel', { 'change': function(field, newValue) { if (newValue === 'disabled') { disabledHint.setVisible(true); - } - else { + } else { if (disabledHint.isVisible()) { disabledHint.setVisible(false); } @@ -158,7 +157,7 @@ Ext.define('PVE.ha.VMResourceEdit', { guestType: undefined, isCreate: undefined, - initComponent : function() { + initComponent: function() { var me = this; if (me.isCreate === undefined) { @@ -183,17 +182,17 @@ Ext.define('PVE.ha.VMResourceEdit', { subject: gettext('Resource') + ': ' + gettext('Container') + '/' + gettext('Virtual Machine'), isAdd: true, - items: [ ipanel ], + items: [ipanel], }); me.callParent(); if (!me.isCreate) { me.load({ - success: function(response, options) { + success: function(response, options) { var values = response.result.data; - var regex = /^(\S+):(\S+)$/; + var regex = /^(\S+):(\S+)$/; var res = regex.exec(values.sid); if (res[1] !== 'vm' && res[1] !== 'ct') { diff --git a/www/manager6/ha/Resources.js b/www/manager6/ha/Resources.js index 0c061731..6e3d314e 100644 --- a/www/manager6/ha/Resources.js +++ b/www/manager6/ha/Resources.js @@ -7,7 +7,7 @@ Ext.define('PVE.ha.ResourcesView', { stateful: true, stateId: 'grid-ha-resources', - initComponent : function() { + initComponent: function() { var me = this; var caps = Ext.state.Manager.get('GuiCap'); @@ -36,7 +36,7 @@ Ext.define('PVE.ha.ResourcesView', { var msg = errors[dataIndex]; if (msg) { metaData.tdCls = 'proxmox-invalid-row'; - var html = '

' + Ext.htmlEncode(msg) + '

'; + var html = '

' + Ext.htmlEncode(msg) + '

'; metaData.tdAttr = 'data-qwidth=600 data-qtitle="ERROR" data-qtip="' + html.replace(/\"/g, '"') + '"'; } @@ -50,7 +50,7 @@ Ext.define('PVE.ha.ResourcesView', { var rec = sm.getSelection()[0]; var sid = rec.data.sid; - var regex = /^(\S+):(\S+)$/; + var regex = /^(\S+):(\S+)$/; var res = regex.exec(sid); if (res[1] !== 'vm' && res[1] !== 'ct') { diff --git a/www/manager6/ha/StatusView.js b/www/manager6/ha/StatusView.js index 4ece08fd..c9c52bc4 100644 --- a/www/manager6/ha/StatusView.js +++ b/www/manager6/ha/StatusView.js @@ -11,7 +11,7 @@ Ext.define('PVE.ha.StatusView', { service: 4, }, - initComponent : function() { + initComponent: function() { var me = this; if (!me.rstore) { @@ -62,10 +62,8 @@ Ext.define('PVE.ha.StatusView', { me.on('activate', me.rstore.startUpdate); me.on('destroy', me.rstore.stopUpdate); - }, }, function() { - Ext.define('pve-ha-status', { extend: 'Ext.data.Model', fields: [ @@ -90,5 +88,4 @@ Ext.define('PVE.ha.StatusView', { ], idProperty: 'id', }); - }); diff --git a/www/manager6/lxc/Config.js b/www/manager6/lxc/Config.js index 9529248d..1becc687 100644 --- a/www/manager6/lxc/Config.js +++ b/www/manager6/lxc/Config.js @@ -62,7 +62,7 @@ Ext.define('PVE.lxc.Config', { vm_command('shutdown'); }, menu: { - items:[{ + items: [{ text: gettext('Reboot'), disabled: !caps.vms['VM.PowerMgmt'], confirmMsg: Proxmox.Utils.format_task_description('vzreboot', vmid), @@ -104,7 +104,8 @@ Ext.define('PVE.lxc.Config', { var moreBtn = Ext.create('Proxmox.button.Button', { text: gettext('More'), - menu: { items: [ + menu: { + items: [ { text: gettext('Clone'), iconCls: 'fa fa-fw fa-clone', @@ -156,7 +157,8 @@ Ext.define('PVE.lxc.Config', { }, iconCls: 'fa fa-trash-o', }, - ]}, + ] +}, }); var consoleBtn = Ext.create('PVE.button.ConsoleButton', { @@ -184,7 +186,7 @@ Ext.define('PVE.lxc.Config', { title: Ext.String.format(gettext("Container {0} on node '{1}'"), vm.text, nodename), hstateid: 'lxctab', tbarSpacing: false, - tbar: [ statusTxt, '->', startBtn, shutdownBtn, migrateBtn, consoleBtn, moreBtn ], + tbar: [statusTxt, '->', startBtn, shutdownBtn, migrateBtn, consoleBtn, moreBtn], defaults: { statusStore: me.statusStore }, items: [ { diff --git a/www/manager6/lxc/CreateWizard.js b/www/manager6/lxc/CreateWizard.js index 8862f24e..387e7da8 100644 --- a/www/manager6/lxc/CreateWizard.js +++ b/www/manager6/lxc/CreateWizard.js @@ -238,13 +238,13 @@ Ext.define('PVE.lxc.CreateWizard', { store: { model: 'KeyValue', sorters: [{ - property : 'key', + property: 'key', direction: 'ASC', }], }, columns: [ - {header: 'Key', width: 150, dataIndex: 'key'}, - {header: 'Value', flex: 1, dataIndex: 'value'}, + { header: 'Key', width: 150, dataIndex: 'key' }, + { header: 'Value', flex: 1, dataIndex: 'value' }, ], }, ], @@ -304,7 +304,7 @@ Ext.define('PVE.lxc.CreateWizard', { waitMsgTarget: wizard, method: 'POST', params: kv, - success: function(response, opts){ + success: function(response, opts) { var upid = response.result.data; var win = Ext.create('Proxmox.window.TaskViewer', { @@ -323,4 +323,3 @@ Ext.define('PVE.lxc.CreateWizard', { }); - diff --git a/www/manager6/lxc/DNS.js b/www/manager6/lxc/DNS.js index efced727..d68d1845 100644 --- a/www/manager6/lxc/DNS.js +++ b/www/manager6/lxc/DNS.js @@ -15,7 +15,7 @@ Ext.define('PVE.lxc.DNSInputPanel', { if (values.nameserver) { var list = values.nameserver.split(/[\ \,\;]+/); values.nameserver = list.join(' '); - } else if(!me.insideWizard) { + } else if (!me.insideWizard) { deletes.push('nameserver'); } @@ -26,7 +26,7 @@ Ext.define('PVE.lxc.DNSInputPanel', { return values; }, - initComponent : function() { + initComponent: function() { var me = this; var items = [ @@ -62,14 +62,14 @@ Ext.define('PVE.lxc.DNSInputPanel', { Ext.define('PVE.lxc.DNSEdit', { extend: 'Proxmox.window.Edit', - initComponent : function() { + initComponent: function() { var me = this; var ipanel = Ext.create('PVE.lxc.DNSInputPanel'); Ext.apply(me, { subject: gettext('Resources'), - items: [ ipanel ], + items: [ipanel], }); me.callParent(); @@ -97,7 +97,7 @@ Ext.define('PVE.lxc.DNS', { onlineHelp: 'pct_container_network', - initComponent : function() { + initComponent: function() { var me = this; var i; @@ -123,7 +123,7 @@ Ext.define('PVE.lxc.DNS', { subject: gettext('Hostname'), items: { xtype: 'inputpanel', - items:{ + items: { fieldLabel: gettext('Hostname'), xtype: 'textfield', name: 'hostname', @@ -136,7 +136,7 @@ Ext.define('PVE.lxc.DNS', { if (values.hostname === undefined || values.hostname === null || values.hostname === '') { - params = { hostname: 'CT'+vmid.toString()}; + params = { hostname: 'CT'+vmid.toString() }; } return params; }, @@ -237,7 +237,7 @@ Ext.define('PVE.lxc.DNS', { cwidth1: 150, interval: 5000, run_editor: run_editor, - tbar: [ edit_btn, revert_btn ], + tbar: [edit_btn, revert_btn], rows: rows, editorConfig: { url: "/api2/extjs/" + baseurl, diff --git a/www/manager6/lxc/MPEdit.js b/www/manager6/lxc/MPEdit.js index ebda5fdd..d9a160a0 100644 --- a/www/manager6/lxc/MPEdit.js +++ b/www/manager6/lxc/MPEdit.js @@ -97,7 +97,7 @@ Ext.define('PVE.lxc.MountPointInputPanel', { me.down('#diskstorage').setNodename(nodename); }, - controller: { + controller: { xclass: 'Ext.app.ViewController', control: { @@ -231,7 +231,7 @@ Ext.define('PVE.lxc.MountPointInputPanel', { xtype: 'textfield', name: 'mp', value: '', - emptyText: gettext('/some/path'), + emptyText: gettext('/some/path'), allowBlank: false, disabled: true, fieldLabel: gettext('Path'), @@ -329,7 +329,7 @@ Ext.define('PVE.lxc.MountPointEdit', { unprivileged: false, - initComponent : function() { + initComponent: function() { var me = this; var nodename = me.pveSelNode.data.node; diff --git a/www/manager6/lxc/MPResize.js b/www/manager6/lxc/MPResize.js index 73f6a9a7..f73c5c3f 100644 --- a/www/manager6/lxc/MPResize.js +++ b/www/manager6/lxc/MPResize.js @@ -5,7 +5,7 @@ Ext.define('PVE.window.MPResize', { resize_disk: function(disk, size) { var me = this; - var params = { disk: disk, size: '+' + size + 'G' }; + var params = { disk: disk, size: '+' + size + 'G' }; Proxmox.Utils.API2Request({ params: params, @@ -24,7 +24,7 @@ Ext.define('PVE.window.MPResize', { }); }, - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { @@ -87,8 +87,8 @@ Ext.define('PVE.window.MPResize', { modal: true, border: false, layout: 'fit', - buttons: [ submitBtn ], - items: [ me.formPanel ], + buttons: [submitBtn], + items: [me.formPanel], }); @@ -97,6 +97,5 @@ Ext.define('PVE.window.MPResize', { if (!me.disk) { return; } - }, }); diff --git a/www/manager6/lxc/Network.js b/www/manager6/lxc/Network.js index 7d75274a..a52f3ec4 100644 --- a/www/manager6/lxc/Network.js +++ b/www/manager6/lxc/Network.js @@ -46,7 +46,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', { return newdata; }, - initComponent : function() { + initComponent: function() { var me = this; var cdata = {}; @@ -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"; @@ -306,7 +306,7 @@ Ext.define('PVE.lxc.NetworkEdit', { isAdd: true, - initComponent : function() { + initComponent: function() { var me = this; if (!me.dataCache) { @@ -327,7 +327,7 @@ Ext.define('PVE.lxc.NetworkEdit', { Ext.apply(me, { subject: gettext('Network Device') + ' (veth)', digest: me.dataCache.digest, - items: [ ipanel ], + items: [ipanel], }); me.callParent(); @@ -375,7 +375,7 @@ Ext.define('PVE.lxc.NetworkView', { }); }, - initComponent : function() { + initComponent: function() { var me = this; var nodename = me.pveSelNode.data.node; @@ -396,7 +396,7 @@ Ext.define('PVE.lxc.NetworkView', { model: 'pve-lxc-network', sorters: [ { - property : 'id', + property: 'id', direction: 'ASC', }, ], @@ -411,7 +411,7 @@ Ext.define('PVE.lxc.NetworkView', { enableFn: function(rec) { return !!caps.vms['VM.Config.Network']; }, - confirmMsg: function (rec) { + confirmMsg: function(rec) { return Ext.String.format(gettext('Are you sure you want to remove entry {0}'), "'" + rec.data.id + "'"); }, @@ -420,11 +420,11 @@ Ext.define('PVE.lxc.NetworkView', { url: me.url, waitMsgTarget: me, method: 'PUT', - params: { 'delete': rec.data.id, digest: me.dataCache.digest }, + params: { 'delete': rec.data.id, digest: me.dataCache.digest }, callback: function() { me.load(); }, - failure: function (response, opts) { + failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); }, }); @@ -556,13 +556,11 @@ Ext.define('PVE.lxc.NetworkView', { me.callParent(); }, }, function() { - Ext.define('pve-lxc-network', { extend: "Ext.data.Model", proxy: { type: 'memory' }, - fields: [ 'id', 'name', 'hwaddr', 'bridge', - 'ip', 'gw', 'ip6', 'gw6', 'tag', 'firewall' ], + fields: ['id', 'name', 'hwaddr', 'bridge', + 'ip', 'gw', 'ip6', 'gw6', 'tag', 'firewall'], }); - }); diff --git a/www/manager6/lxc/Options.js b/www/manager6/lxc/Options.js index dfc07b59..97d8137c 100644 --- a/www/manager6/lxc/Options.js +++ b/www/manager6/lxc/Options.js @@ -4,7 +4,7 @@ Ext.define('PVE.lxc.Options', { onlineHelp: 'pct_options', - initComponent : function() { + initComponent: function() { var me = this; var i; @@ -41,8 +41,8 @@ Ext.define('PVE.lxc.Options', { header: gettext('Start/Shutdown order'), defaultValue: '', renderer: PVE.Utils.render_kvm_startup, - editor: caps.vms['VM.Config.Options'] && caps.nodes['Sys.Modify'] ? - { + editor: caps.vms['VM.Config.Options'] && caps.nodes['Sys.Modify'] + ? { xtype: 'pveWindowStartupEdit', onlineHelp: 'pct_startup_and_shutdown', } : undefined, @@ -137,8 +137,8 @@ Ext.define('PVE.lxc.Options', { features: { header: gettext('Features'), defaultValue: Proxmox.Utils.noneText, - editor: Proxmox.UserName === 'root@pam' ? - 'PVE.lxc.FeaturesEdit' : undefined, + editor: Proxmox.UserName === 'root@pam' + ? 'PVE.lxc.FeaturesEdit' : undefined, }, hookscript: { header: gettext('Hookscript'), @@ -184,7 +184,7 @@ Ext.define('PVE.lxc.Options', { url: "/api2/json/nodes/" + nodename + "/lxc/" + vmid + "/pending", selModel: sm, interval: 5000, - tbar: [ edit_btn, revert_btn ], + tbar: [edit_btn, revert_btn], rows: rows, editorConfig: { url: '/api2/extjs/' + baseurl, @@ -204,7 +204,6 @@ Ext.define('PVE.lxc.Options', { me.mon(me.getStore(), 'datachanged', function() { set_button_status(); }); - }, }); diff --git a/www/manager6/lxc/ResourceEdit.js b/www/manager6/lxc/ResourceEdit.js index fb1a05fc..6f21571b 100644 --- a/www/manager6/lxc/ResourceEdit.js +++ b/www/manager6/lxc/ResourceEdit.js @@ -3,7 +3,7 @@ var labelWidth = 120; Ext.define('PVE.lxc.MemoryEdit', { extend: 'Proxmox.window.Edit', - initComponent : function() { + initComponent: function() { var me = this; Ext.apply(me, { @@ -21,7 +21,7 @@ Ext.define('PVE.lxc.MemoryEdit', { Ext.define('PVE.lxc.CPUEdit', { extend: 'Proxmox.window.Edit', - initComponent : function() { + initComponent: function() { var me = this; Ext.apply(me, { @@ -109,7 +109,7 @@ Ext.define('PVE.lxc.MemoryInputPanel', { insideWizard: false, - initComponent : function() { + initComponent: function() { var me = this; var items = [ diff --git a/www/manager6/lxc/Resources.js b/www/manager6/lxc/Resources.js index c4b902cd..e58860a5 100644 --- a/www/manager6/lxc/Resources.js +++ b/www/manager6/lxc/Resources.js @@ -15,7 +15,7 @@ Ext.define('PVE.lxc.RessourceView', { return rowdef.header || key; }, - initComponent : function() { + initComponent: function() { var me = this; var i, confid; @@ -145,7 +145,7 @@ Ext.define('PVE.lxc.RessourceView', { params: { 'delete': rec.data.key, }, - failure: function (response, opts) { + failure: function(response, opts) { Ext.Msg.alert('Error', response.htmlStatus); }, }); @@ -247,7 +247,6 @@ Ext.define('PVE.lxc.RessourceView', { resize_btn.setDisabled(!isDisk || !diskCap || isUnusedDisk); move_btn.setDisabled(!isDisk || !diskCap); revert_btn.setDisabled(!pending); - }; var sorterFn = function(rec1, rec2) { diff --git a/www/manager6/node/Certificates.js b/www/manager6/node/Certificates.js index f3a2d68b..d615807b 100644 --- a/www/manager6/node/Certificates.js +++ b/www/manager6/node/Certificates.js @@ -4,7 +4,7 @@ Ext.define('PVE.node.CertificateView', { onlineHelp: 'sysadmin_certificate_management', - mixins: ['Proxmox.Mixin.CBind' ], + mixins: ['Proxmox.Mixin.CBind'], items: [ { @@ -230,7 +230,7 @@ Ext.define('PVE.node.CertUpload', { Ext.define('pve-certificate', { extend: 'Ext.data.Model', - fields: [ 'filename', 'fingerprint', 'issuer', 'notafter', 'notbefore', 'subject', 'san', 'public-key-bits', 'public-key-type' ], + fields: ['filename', 'fingerprint', 'issuer', 'notafter', 'notbefore', 'subject', 'san', 'public-key-bits', 'public-key-type'], idProperty: 'filename', }); @@ -365,7 +365,7 @@ Ext.define('PVE.node.Certificates', { } var win = Ext.create('PVE.node.CertificateViewer', { cert: selection[0].data.filename, - nodename : me.nodename, + nodename: me.nodename, }); win.show(); }, diff --git a/www/manager6/node/Directory.js b/www/manager6/node/Directory.js index 646f6e46..da4716d0 100644 --- a/www/manager6/node/Directory.js +++ b/www/manager6/node/Directory.js @@ -8,7 +8,7 @@ Ext.define('PVE.node.CreateDirectory', { onlineHelp: 'chapter_storage', - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { @@ -140,7 +140,7 @@ Ext.define('PVE.node.Directorylist', { Ext.apply(me, { store: { - fields: ['path', 'device', 'type', 'options', 'unitfile' ], + fields: ['path', 'device', 'type', 'options', 'unitfile'], proxy: { type: 'proxmox', url: "/api2/json/nodes/" + me.nodename + '/disks/directory', diff --git a/www/manager6/node/LVM.js b/www/manager6/node/LVM.js index f437a2bc..a778d135 100644 --- a/www/manager6/node/LVM.js +++ b/www/manager6/node/LVM.js @@ -8,7 +8,7 @@ Ext.define('PVE.node.CreateLVM', { onlineHelp: 'chapter_lvm', - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { diff --git a/www/manager6/node/LVMThin.js b/www/manager6/node/LVMThin.js index 0f7b70ba..92adace7 100644 --- a/www/manager6/node/LVMThin.js +++ b/www/manager6/node/LVMThin.js @@ -8,7 +8,7 @@ Ext.define('PVE.node.CreateLVMThin', { onlineHelp: 'chapter_lvm', - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { diff --git a/www/manager6/node/StatusView.js b/www/manager6/node/StatusView.js index 8b62590a..2af7fb04 100644 --- a/www/manager6/node/StatusView.js +++ b/www/manager6/node/StatusView.js @@ -97,9 +97,9 @@ Ext.define('PVE.node.StatusView', { renderer: function(cpuinfo) { return cpuinfo.cpus + " x " + cpuinfo.model + " (" + cpuinfo.sockets.toString() + " " + - (cpuinfo.sockets > 1 ? - gettext('Sockets') : - gettext('Socket') + (cpuinfo.sockets > 1 + ? gettext('Sockets') + : gettext('Socket') ) + ")"; }, value: '', diff --git a/www/manager6/node/Summary.js b/www/manager6/node/Summary.js index 605385af..3acc4b66 100644 --- a/www/manager6/node/Summary.js +++ b/www/manager6/node/Summary.js @@ -30,7 +30,7 @@ Ext.define('PVE.node.Summary', { height: 600, layout: 'fit', modal: true, - items: [ view ], + items: [view], buttons: [ { xtype: 'button', @@ -99,7 +99,7 @@ Ext.define('PVE.node.Summary', { var version_btn = new Ext.Button({ text: gettext('Package versions'), - handler: function(){ + handler: function() { Proxmox.Utils.checked_command(function() { me.showVersions(); }); }, }); @@ -110,7 +110,7 @@ Ext.define('PVE.node.Summary', { }); Ext.apply(me, { - tbar: [version_btn, '->', { xtype: 'proxmoxRRDTypeSelector' } ], + tbar: [version_btn, '->', { xtype: 'proxmoxRRDTypeSelector' }], items: [ { xtype: 'container', diff --git a/www/manager6/node/ZFS.js b/www/manager6/node/ZFS.js index 8689817c..8ca6776f 100644 --- a/www/manager6/node/ZFS.js +++ b/www/manager6/node/ZFS.js @@ -10,7 +10,7 @@ Ext.define('PVE.node.CreateZFS', { width: 800, - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { @@ -422,7 +422,7 @@ Ext.define('PVE.node.ZFSList', { resizable: true, layout: 'fit', title: gettext('Status') + ': ' + zpool, - items:[{ + items: [{ xtype: 'panel', region: 'center', layout: { @@ -434,7 +434,6 @@ Ext.define('PVE.node.ZFSList', { text: gettext('Reload'), iconCls: 'fa fa-refresh', handler: function() { - devicetree.reload(); detailsgrid.reload(); }, diff --git a/www/manager6/panel/ConfigPanel.js b/www/manager6/panel/ConfigPanel.js index e33360df..9f1c373b 100644 --- a/www/manager6/panel/ConfigPanel.js +++ b/www/manager6/panel/ConfigPanel.js @@ -176,12 +176,12 @@ Ext.define('PVE.panel.Config', { me.tbar = undefined; if (!me.onlineHelp) { - switch(me.pveSelNode.data.id) { - case 'type/storage':me.onlineHelp = 'chapter-pvesm.html'; break; - case 'type/qemu':me.onlineHelp = 'chapter-qm.html'; break; - case 'type/lxc':me.onlineHelp = 'chapter-pct.html'; break; - case 'type/pool':me.onlineHelp = 'chapter-pveum.html#_pools'; break; - case 'type/node':me.onlineHelp = 'chapter-sysadmin.html'; break; + switch (me.pveSelNode.data.id) { + case 'type/storage': me.onlineHelp = 'chapter-pvesm.html'; break; + case 'type/qemu': me.onlineHelp = 'chapter-qm.html'; break; + case 'type/lxc': me.onlineHelp = 'chapter-pct.html'; break; + case 'type/pool': me.onlineHelp = 'chapter-pveum.html#_pools'; break; + case 'type/node': me.onlineHelp = 'chapter-sysadmin.html'; break; } } diff --git a/www/manager6/panel/GuestStatusView.js b/www/manager6/panel/GuestStatusView.js index 11969e55..8dab4c19 100644 --- a/www/manager6/panel/GuestStatusView.js +++ b/www/manager6/panel/GuestStatusView.js @@ -5,7 +5,7 @@ Ext.define('PVE.panel.GuestStatusView', { height: 300, - cbindData: function (initialConfig) { + cbindData: function(initialConfig) { var me = this; return { isQemu: me.pveSelNode.data.type === 'qemu', diff --git a/www/manager6/panel/GuestSummary.js b/www/manager6/panel/GuestSummary.js index 8f822304..18d26b6b 100644 --- a/www/manager6/panel/GuestSummary.js +++ b/www/manager6/panel/GuestSummary.js @@ -50,7 +50,6 @@ Ext.define('PVE.qemu.Summary', { var rrdstore; if (!template) { - // in non-template mode put the two panels always together items = [ { @@ -100,11 +99,10 @@ Ext.define('PVE.qemu.Summary', { store: rrdstore, }, ); - } Ext.apply(me, { - tbar: [ '->', { xtype: 'proxmoxRRDTypeSelector' } ], + tbar: ['->', { xtype: 'proxmoxRRDTypeSelector' }], items: [ { xtype: 'container', diff --git a/www/manager6/panel/HealthWidget.js b/www/manager6/panel/HealthWidget.js index ccfa13e7..3543223a 100644 --- a/www/manager6/panel/HealthWidget.js +++ b/www/manager6/panel/HealthWidget.js @@ -9,7 +9,7 @@ Ext.define('PVE.widget.HealthWidget', { }, style: { - 'text-align':'center', + 'text-align': 'center', }, tpl: [ @@ -24,7 +24,7 @@ Ext.define('PVE.widget.HealthWidget', { me.update(Ext.apply(me.data, data)); }, - initComponent: function(){ + initComponent: function() { var me = this; if (me.title) { diff --git a/www/manager6/panel/IPSet.js b/www/manager6/panel/IPSet.js index 13091c32..8cb387c0 100644 --- a/www/manager6/panel/IPSet.js +++ b/www/manager6/panel/IPSet.js @@ -1,6 +1,6 @@ Ext.define('pve-fw-ipsets', { extend: 'Ext.data.Model', - fields: [ 'name', 'comment', 'digest' ], + fields: ['name', 'comment', 'digest'], idProperty: 'name', }); @@ -20,7 +20,6 @@ Ext.define('PVE.IPSetList', { editBtn: undefined, initComponent: function() { - var me = this; if (me.ipset_panel == undefined) { @@ -125,7 +124,6 @@ Ext.define('PVE.IPSetList', { }); win.show(); win.on('destroy', reload); - }, }); @@ -137,7 +135,7 @@ Ext.define('PVE.IPSetList', { Ext.apply(me, { store: store, - tbar: [ 'IPSet:', me.addBtn, me.removeBtn, me.editBtn ], + tbar: ['IPSet:', me.addBtn, me.removeBtn, me.editBtn], selModel: sm, columns: [ { header: 'IPSet', dataIndex: 'name', width: '100' }, @@ -167,8 +165,7 @@ Ext.define('PVE.IPSetCidrEdit', { cidr: undefined, - initComponent : function() { - + initComponent: function() { var me = this; me.isCreate = (me.cidr === undefined); @@ -232,14 +229,14 @@ Ext.define('PVE.IPSetCidrEdit', { Ext.apply(me, { subject: gettext('IP/CIDR'), - items: [ ipanel ], + items: [ipanel], }); me.callParent(); if (!me.isCreate) { me.load({ - success: function(response, options) { + success: function(response, options) { var values = response.result.data; ipanel.setValues(values); }, @@ -347,7 +344,7 @@ Ext.define('PVE.IPSetGrid', { var msg = errors.cidr || errors.nomatch; if (msg) { metaData.tdCls = 'proxmox-invalid-row'; - var html = '

' + Ext.htmlEncode(msg) + '

'; + var html = '

' + Ext.htmlEncode(msg) + '

'; metaData.tdAttr = 'data-qwidth=600 data-qtitle="ERROR" data-qtip="' + html.replace(/\"/g, '"') + '"'; } @@ -356,7 +353,7 @@ Ext.define('PVE.IPSetGrid', { }; Ext.apply(me, { - tbar: [ 'IP/CIDR:', me.addBtn, me.removeBtn, me.editBtn ], + tbar: ['IP/CIDR:', me.addBtn, me.removeBtn, me.editBtn], store: store, selModel: sm, listeners: { @@ -396,14 +393,12 @@ Ext.define('PVE.IPSetGrid', { } }, }, function() { - Ext.define('pve-ipset', { extend: 'Ext.data.Model', - fields: [ { name: 'nomatch', type: 'boolean' }, - 'cidr', 'comment', 'errors' ], + fields: [{ name: 'nomatch', type: 'boolean' }, + 'cidr', 'comment', 'errors'], idProperty: 'cidr', }); - }); Ext.define('PVE.IPSet', { @@ -440,7 +435,7 @@ Ext.define('PVE.IPSet', { Ext.apply(me, { layout: 'border', - items: [ ipset_list, ipset_panel ], + items: [ipset_list, ipset_panel], listeners: { show: function() { ipset_list.fireEvent('show', ipset_list); diff --git a/www/manager6/panel/InfoWidget.js b/www/manager6/panel/InfoWidget.js index ed1c1a0c..f3b07038 100644 --- a/www/manager6/panel/InfoWidget.js +++ b/www/manager6/panel/InfoWidget.js @@ -57,7 +57,7 @@ Ext.define('PVE.widget.Info', { updateValue: function(text, usage) { var me = this; var label = me.getComponent('label'); - label.update(Ext.apply(label.data, {title: me.title, usage:text})); + label.update(Ext.apply(label.data, { title: me.title, usage: text })); if (usage !== undefined && me.printBar && diff --git a/www/manager6/panel/NotesView.js b/www/manager6/panel/NotesView.js index 1cf75d39..18dd8876 100644 --- a/www/manager6/panel/NotesView.js +++ b/www/manager6/panel/NotesView.js @@ -75,7 +75,7 @@ Ext.define('PVE.panel.NotesView', { }, }], - initComponent : function() { + initComponent: function() { var me = this; var nodename = me.pveSelNode.data.node; diff --git a/www/manager6/panel/RunningChart.js b/www/manager6/panel/RunningChart.js index d6179810..f6c9109d 100644 --- a/www/manager6/panel/RunningChart.js +++ b/www/manager6/panel/RunningChart.js @@ -62,7 +62,7 @@ Ext.define('PVE.widget.RunningChart', { colors: ['#cfcfcf'], tooltip: { trackMouse: true, - renderer: function( tooltip, record, ctx) { + renderer: function(tooltip, record, ctx) { let me = this.getChart(); if (!record || !record.data) return; let date = new Date(record.data.time); @@ -138,15 +138,15 @@ Ext.define('PVE.widget.RunningChart', { setTitle: function(title) { this.title = title; var me = this.getComponent('title'); - me.update({title: title}); + me.update({ title: title }); }, - initComponent: function(){ + initComponent: function() { var me = this; me.callParent(); if (me.title) { - me.getComponent('title').update({title: me.title}); + me.getComponent('title').update({ title: me.title }); } me.chart = me.getComponent('chart'); me.chart.timeaxis = me.chart.getAxes()[1]; diff --git a/www/manager6/panel/StatusPanel.js b/www/manager6/panel/StatusPanel.js index 33413285..12a76042 100644 --- a/www/manager6/panel/StatusPanel.js +++ b/www/manager6/panel/StatusPanel.js @@ -60,6 +60,5 @@ Ext.define('PVE.panel.StatusPanel', { me.on('destroy', function() { sp.un('statechange', statechange); }); - }, }); diff --git a/www/manager6/panel/StatusView.js b/www/manager6/panel/StatusView.js index 057e30a1..757cd164 100644 --- a/www/manager6/panel/StatusView.js +++ b/www/manager6/panel/StatusView.js @@ -40,7 +40,7 @@ Ext.define('PVE.panel.StatusView', { fieldCalculator: function(used, max) { if (!Ext.isNumeric(max) && Ext.isNumeric(used)) { return used; - } else if(!Ext.isNumeric(used)) { + } else if (!Ext.isNumeric(used)) { /* we come here if the field is from a node * where the records are not mem and maxmem * but mem.used and mem.total @@ -65,7 +65,7 @@ Ext.define('PVE.panel.StatusView', { field.updateValue(renderer.call(field, me.getStore().getRecord())); } else if (field.textField !== undefined) { field.updateValue(renderer.call(field, me.getRecordValue(field.textField))); - } else if(field.valueField !== undefined) { + } else if (field.valueField !== undefined) { var used = me.getRecordValue(field.valueField); /* string and int */ var max = field.maxField !== undefined ? me.getRecordValue(field.maxField) : 1; diff --git a/www/manager6/pool/StatusView.js b/www/manager6/pool/StatusView.js index 19e75ace..302ae5ab 100644 --- a/www/manager6/pool/StatusView.js +++ b/www/manager6/pool/StatusView.js @@ -7,7 +7,7 @@ Ext.define('PVE.pool.StatusView', { cwidth1: 150, interval: 30000, //height: 195, - initComponent : function() { + initComponent: function() { var me = this; var pool = me.pveSelNode.data.pool; diff --git a/www/manager6/pool/Summary.js b/www/manager6/pool/Summary.js index b1f776f8..1a47428d 100644 --- a/www/manager6/pool/Summary.js +++ b/www/manager6/pool/Summary.js @@ -24,7 +24,7 @@ Ext.define('PVE.pool.Summary', { style: 'padding-top:10px', width: 800, }, - items: [ statusview ], + items: [statusview], }); me.on('activate', rstore.startUpdate); diff --git a/www/manager6/qemu/AgentIPView.js b/www/manager6/qemu/AgentIPView.js index 49052d93..c3b1f89f 100644 --- a/www/manager6/qemu/AgentIPView.js +++ b/www/manager6/qemu/AgentIPView.js @@ -36,7 +36,7 @@ Ext.define('PVE.window.IPInfo', { val.forEach(function(ip) { var addr = ip['ip-address']; var pref = ip.prefix; - if (addr && pref) { + if (addr && pref) { ips.push(addr + '/' + pref); } }); @@ -106,7 +106,6 @@ Ext.define('PVE.qemu.AgentIPView', { if (nic['hardware-address'] && nic['hardware-address'] != '00:00:00:00:00:00' && nic['hardware-address'] != '0:0:0:0:0:0') { - var nic_ips = nic['ip-addresses'] || []; nic_ips.forEach(function(ip) { var p = ip['ip-address']; diff --git a/www/manager6/qemu/AudioEdit.js b/www/manager6/qemu/AudioEdit.js index 617ef26b..e7861ceb 100644 --- a/www/manager6/qemu/AudioEdit.js +++ b/www/manager6/qemu/AudioEdit.js @@ -50,7 +50,7 @@ Ext.define('PVE.qemu.AudioEdit', { xtype: 'pveAudioInputPanel', }], - initComponent : function() { + initComponent: function() { var me = this; me.callParent(); diff --git a/www/manager6/qemu/CDEdit.js b/www/manager6/qemu/CDEdit.js index ea76b720..a26854aa 100644 --- a/www/manager6/qemu/CDEdit.js +++ b/www/manager6/qemu/CDEdit.js @@ -62,7 +62,7 @@ Ext.define('PVE.qemu.CDInputPanel', { me.cdfilesel.setStorage(undefined, nodename); }, - initComponent : function() { + initComponent: function() { var me = this; me.drive = {}; @@ -90,7 +90,7 @@ Ext.define('PVE.qemu.CDInputPanel', { me.down('field[name=cdstorage]').setDisabled(!value); var cdImageField = me.down('field[name=cdimage]'); cdImageField.setDisabled(!value); - if(value) { + if (value) { cdImageField.validate(); } else { cdImageField.reset(); @@ -151,7 +151,7 @@ Ext.define('PVE.qemu.CDEdit', { width: 400, - initComponent : function() { + initComponent: function() { var me = this; var nodename = me.pveSelNode.data.node; @@ -168,13 +168,13 @@ Ext.define('PVE.qemu.CDEdit', { Ext.applyIf(me, { subject: 'CD/DVD Drive', - items: [ ipanel ], + items: [ipanel], }); me.callParent(); me.load({ - success: function(response, options) { + success: function(response, options) { ipanel.setVMConfig(response.result.data); if (me.confid) { var value = response.result.data[me.confid]; diff --git a/www/manager6/qemu/CIDriveEdit.js b/www/manager6/qemu/CIDriveEdit.js index c45735c6..754b8353 100644 --- a/www/manager6/qemu/CIDriveEdit.js +++ b/www/manager6/qemu/CIDriveEdit.js @@ -28,7 +28,7 @@ Ext.define('PVE.qemu.CIDriveInputPanel', { me.down('#drive').setVMConfig(config, 'cdrom'); }, - initComponent : function() { + initComponent: function() { var me = this; me.drive = {}; @@ -60,7 +60,7 @@ Ext.define('PVE.qemu.CIDriveEdit', { isCreate: true, subject: gettext('CloudInit Drive'), - initComponent : function() { + initComponent: function() { var me = this; var nodename = me.pveSelNode.data.node; diff --git a/www/manager6/qemu/CloudInit.js b/www/manager6/qemu/CloudInit.js index c5ec5eda..31a139b7 100644 --- a/www/manager6/qemu/CloudInit.js +++ b/www/manager6/qemu/CloudInit.js @@ -35,7 +35,7 @@ Ext.define('PVE.qemu.CloudInit', { handler: function() { var me = this.up('grid'); var records = me.getSelection(); - if (!records || !records.length) { + if (!records || !records.length) { return; } @@ -164,7 +164,7 @@ Ext.define('PVE.qemu.CloudInit', { }, listeners: { - activate: function () { + activate: function() { var me = this; me.rstore.startUpdate(); }, @@ -188,7 +188,7 @@ Ext.define('PVE.qemu.CloudInit', { } var caps = Ext.state.Manager.get('GuiCap'); me.baseurl = '/api2/extjs/nodes/' + nodename + '/qemu/' + vmid; - me.url = me.baseurl + '/pending'; + me.url = me.baseurl + '/pending'; me.editorConfig.url = me.baseurl + '/config'; me.editorConfig.pveSelNode = me.pveSelNode; diff --git a/www/manager6/qemu/Config.js b/www/manager6/qemu/Config.js index f95ac7a2..ce2a7686 100644 --- a/www/manager6/qemu/Config.js +++ b/www/manager6/qemu/Config.js @@ -80,7 +80,8 @@ Ext.define('PVE.qemu.Config', { var moreBtn = Ext.create('Proxmox.button.Button', { text: gettext('More'), - menu: { items: [ + menu: { + items: [ { text: gettext('Clone'), iconCls: 'fa fa-fw fa-clone', @@ -131,7 +132,8 @@ Ext.define('PVE.qemu.Config', { }, iconCls: 'fa fa-trash-o', }, - ]}, + ] +}, }); var shutdownBtn = Ext.create('PVE.button.Split', { @@ -217,7 +219,7 @@ Ext.define('PVE.qemu.Config', { title: Ext.String.format(gettext("Virtual Machine {0} on node '{1}'"), vm.text, nodename), hstateid: 'kvmtab', tbarSpacing: false, - tbar: [ statusTxt, '->', resumeBtn, startBtn, shutdownBtn, migrateBtn, consoleBtn, moreBtn ], + tbar: [statusTxt, '->', resumeBtn, startBtn, shutdownBtn, migrateBtn, consoleBtn, moreBtn], defaults: { statusStore: me.statusStore }, items: [ { @@ -389,7 +391,6 @@ Ext.define('PVE.qemu.Config', { spice = s.data.get('spice') ? true : false; xtermjs = s.data.get('serial') ? true : false; - } if (template) { diff --git a/www/manager6/qemu/CreateWizard.js b/www/manager6/qemu/CreateWizard.js index f43f9573..666131e7 100644 --- a/www/manager6/qemu/CreateWizard.js +++ b/www/manager6/qemu/CreateWizard.js @@ -101,7 +101,6 @@ Ext.define('PVE.qemu.CreateWizard', { }, ], onGetValues: function(values) { - ['name', 'pool', 'onboot', 'agent'].forEach(function(field) { if (!values[field]) { delete values[field]; @@ -190,13 +189,13 @@ Ext.define('PVE.qemu.CreateWizard', { store: { model: 'KeyValue', sorters: [{ - property : 'key', + property: 'key', direction: 'ASC', }], }, columns: [ - {header: 'Key', width: 150, dataIndex: 'key'}, - {header: 'Value', flex: 1, dataIndex: 'value'}, + { header: 'Key', width: 150, dataIndex: 'key' }, + { header: 'Value', flex: 1, dataIndex: 'value' }, ], }, ], @@ -227,7 +226,6 @@ Ext.define('PVE.qemu.CreateWizard', { summarystore.sort(); summarystore.resumeEvents(); summarystore.fireEvent('refresh'); - }, }, onSubmit: function() { @@ -243,7 +241,7 @@ Ext.define('PVE.qemu.CreateWizard', { waitMsgTarget: wizard, method: 'POST', params: kv, - success: function(response){ + success: function(response) { wizard.close(); }, failure: function(response, opts) { @@ -256,5 +254,3 @@ Ext.define('PVE.qemu.CreateWizard', { }); - - diff --git a/www/manager6/qemu/DisplayEdit.js b/www/manager6/qemu/DisplayEdit.js index 6838abcc..9f1c4fdd 100644 --- a/www/manager6/qemu/DisplayEdit.js +++ b/www/manager6/qemu/DisplayEdit.js @@ -98,7 +98,7 @@ Ext.define('PVE.qemu.DisplayEdit', { xtype: 'pveDisplayInputPanel', }], - initComponent : function() { + initComponent: function() { var me = this; me.callParent(); diff --git a/www/manager6/qemu/HDEdit.js b/www/manager6/qemu/HDEdit.js index 8092fd27..d0723c05 100644 --- a/www/manager6/qemu/HDEdit.js +++ b/www/manager6/qemu/HDEdit.js @@ -39,7 +39,7 @@ Ext.define('PVE.qemu.HDInputPanel', { change: 'onControllerChange', afterrender: 'onControllerChange', }, - 'field[name=iothread]' : { + 'field[name=iothread]': { change: function(f, value) { if (!this.getView().insideWizard) { return; @@ -155,7 +155,7 @@ Ext.define('PVE.qemu.HDInputPanel', { me.down('#hdimage').setStorage(undefined, nodename); }, - initComponent : function() { + initComponent: function() { var me = this; var labelWidth = 140; @@ -170,7 +170,7 @@ Ext.define('PVE.qemu.HDInputPanel', { if (!me.confid || me.unused) { me.bussel = Ext.create('PVE.form.ControllerSelector', { - vmconfig: me.insideWizard ? {ide2: 'cdrom'} : {}, + vmconfig: me.insideWizard ? { ide2: 'cdrom' } : {}, }); me.column1.push(me.bussel); @@ -356,7 +356,7 @@ Ext.define('PVE.qemu.HDEdit', { backgroundDelay: 5, - initComponent : function() { + initComponent: function() { var me = this; var nodename = me.pveSelNode.data.node; @@ -384,7 +384,7 @@ Ext.define('PVE.qemu.HDEdit', { me.subject = gettext('Hard Disk') + ' (' + me.confid + ')'; } - me.items = [ ipanel ]; + me.items = [ipanel]; me.callParent(); /* 'data' is assigned an empty array in same file, and here we diff --git a/www/manager6/qemu/HDEfi.js b/www/manager6/qemu/HDEfi.js index 74e300f4..7cee8261 100644 --- a/www/manager6/qemu/HDEfi.js +++ b/www/manager6/qemu/HDEfi.js @@ -32,7 +32,7 @@ Ext.define('PVE.qemu.EFIDiskInputPanel', { me.down('#hdimage').setStorage(undefined, nodename); }, - initComponent : function() { + initComponent: function() { var me = this; me.drive = {}; @@ -64,7 +64,7 @@ Ext.define('PVE.qemu.EFIDiskEdit', { subject: gettext('EFI Disk'), width: 450, - initComponent : function() { + initComponent: function() { var me = this; var nodename = me.pveSelNode.data.node; diff --git a/www/manager6/qemu/HDMove.js b/www/manager6/qemu/HDMove.js index 8716a451..1047ce5c 100644 --- a/www/manager6/qemu/HDMove.js +++ b/www/manager6/qemu/HDMove.js @@ -39,10 +39,9 @@ Ext.define('PVE.window.HDMove', { win.on('destroy', function() { me.close(); }); }, }); - }, - initComponent : function() { + initComponent: function() { var me = this; var diskarray = []; @@ -119,8 +118,8 @@ Ext.define('PVE.window.HDMove', { width: 350, border: false, layout: 'fit', - buttons: [ submitBtn ], - items: [ me.formPanel ], + buttons: [submitBtn], + items: [me.formPanel], }); diff --git a/www/manager6/qemu/HDResize.js b/www/manager6/qemu/HDResize.js index 524af347..a18e242c 100644 --- a/www/manager6/qemu/HDResize.js +++ b/www/manager6/qemu/HDResize.js @@ -5,7 +5,7 @@ Ext.define('PVE.window.HDResize', { resize_disk: function(disk, size) { var me = this; - var params = { disk: disk, size: '+' + size + 'G' }; + var params = { disk: disk, size: '+' + size + 'G' }; Proxmox.Utils.API2Request({ params: params, @@ -21,7 +21,7 @@ Ext.define('PVE.window.HDResize', { }); }, - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { @@ -86,8 +86,8 @@ Ext.define('PVE.window.HDResize', { height: 150, border: false, layout: 'fit', - buttons: [ submitBtn ], - items: [ me.formPanel ], + buttons: [submitBtn], + items: [me.formPanel], }); @@ -96,6 +96,5 @@ Ext.define('PVE.window.HDResize', { if (!me.disk) { return; } - }, }); diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js index 0bc913b4..5f60da1c 100644 --- a/www/manager6/qemu/HardwareView.js +++ b/www/manager6/qemu/HardwareView.js @@ -43,7 +43,7 @@ Ext.define('PVE.qemu.HardwareView', { } }, - initComponent : function() { + initComponent: function() { var me = this; var i, confid; @@ -73,10 +73,10 @@ Ext.define('PVE.qemu.HardwareView', { var res = ''; var max = me.getObjectValue('memory', 512, pending); - var balloon = me.getObjectValue('balloon', undefined, pending); + var balloon = me.getObjectValue('balloon', undefined, pending); var shares = me.getObjectValue('shares', undefined, pending); - res = Proxmox.Utils.format_size(max*1024*1024); + res = Proxmox.Utils.format_size(max*1024*1024); if (balloon !== undefined && balloon > 0) { res = Proxmox.Utils.format_size(balloon*1024*1024) + "/" + res; @@ -93,14 +93,13 @@ Ext.define('PVE.qemu.HardwareView', { sockets: { header: gettext('Processors'), never_delete: true, - editor: (caps.vms['VM.Config.CPU'] || caps.vms['VM.Config.HWType']) ? - 'PVE.qemu.ProcessorEdit' : undefined, + editor: (caps.vms['VM.Config.CPU'] || caps.vms['VM.Config.HWType']) + ? 'PVE.qemu.ProcessorEdit' : undefined, tdCls: 'pve-itype-icon-processor', group: 3, defaultValue: '1', multiKey: ['sockets', 'cpu', 'cores', 'numa', 'vcpus', 'cpulimit', 'cpuunits'], renderer: function(value, metaData, record, rowIndex, colIndex, store, pending) { - var sockets = me.getObjectValue('sockets', 1, pending); var model = me.getObjectValue('cpu', undefined, pending); var cores = me.getObjectValue('cores', 1, pending); @@ -149,13 +148,13 @@ Ext.define('PVE.qemu.HardwareView', { editor: caps.vms['VM.Config.HWType'] ? 'PVE.qemu.DisplayEdit' : undefined, never_delete: true, iconCls: 'desktop', - group:5, + group: 5, defaultValue: '', renderer: PVE.Utils.render_kvm_vga_driver, }, machine: { header: gettext('Machine'), - editor: caps.vms['VM.Config.HWType'] ? { + editor: caps.vms['VM.Config.HWType'] ? { xtype: 'proxmoxWindowEdit', subject: gettext('Machine'), width: 350, @@ -168,7 +167,8 @@ Ext.define('PVE.qemu.HardwareView', { ['__default__', PVE.Utils.render_qemu_machine('')], ['q35', 'q35'], ], - }]} : undefined, + }] +} : undefined, iconCls: 'cogs', never_delete: true, group: 6, @@ -470,7 +470,7 @@ Ext.define('PVE.qemu.HardwareView', { 'delete': rec.data.key, }, callback: () => me.reload(), - failure: function (response, opts) { + failure: function(response, opts) { Ext.Msg.alert('Error', response.htmlStatus); }, success: function(response, options) { @@ -537,7 +537,7 @@ Ext.define('PVE.qemu.HardwareView', { // en/disable hardwarebuttons counts = {}; var hasCloudInit = false; - me.rstore.getData().items.forEach(function(item){ + me.rstore.getData().items.forEach(function(item) { if (!hasCloudInit && ( /vm-.*-cloudinit/.test(item.data.value) || /vm-.*-cloudinit/.test(item.data.pending) @@ -604,7 +604,6 @@ Ext.define('PVE.qemu.HardwareView', { move_btn.setDisabled(pending || !(isUsedDisk || isEfi) || !diskCap); revert_btn.setDisabled(!pending); - }; Ext.apply(me, { diff --git a/www/manager6/qemu/IPConfigEdit.js b/www/manager6/qemu/IPConfigEdit.js index 6aa02759..2b119050 100644 --- a/www/manager6/qemu/IPConfigEdit.js +++ b/www/manager6/qemu/IPConfigEdit.js @@ -55,7 +55,7 @@ Ext.define('PVE.qemu.IPConfigPanel', { me.setValues(me.ipconfig); }, - initComponent : function() { + initComponent: function() { var me = this; me.ipconfig = {}; @@ -187,8 +187,7 @@ Ext.define('PVE.qemu.IPConfigEdit', { isAdd: true, - initComponent : function() { - + initComponent: function() { var me = this; // convert confid from netX to ipconfigX diff --git a/www/manager6/qemu/KeyboardEdit.js b/www/manager6/qemu/KeyboardEdit.js index c0042d6d..da7b56c0 100644 --- a/www/manager6/qemu/KeyboardEdit.js +++ b/www/manager6/qemu/KeyboardEdit.js @@ -1,7 +1,7 @@ Ext.define('PVE.qemu.KeyboardEdit', { extend: 'Proxmox.window.Edit', - initComponent : function() { + initComponent: function() { var me = this; Ext.applyIf(me, { diff --git a/www/manager6/qemu/MemoryEdit.js b/www/manager6/qemu/MemoryEdit.js index 8f647aa8..b4ea127b 100644 --- a/www/manager6/qemu/MemoryEdit.js +++ b/www/manager6/qemu/MemoryEdit.js @@ -126,7 +126,7 @@ Ext.define('PVE.qemu.MemoryEdit', { var me = this; var memoryhotplug; - if(me.hotplug) { + if (me.hotplug) { Ext.each(me.hotplug.split(','), function(el) { if (el === 'memory') { memoryhotplug = 1; @@ -140,7 +140,7 @@ Ext.define('PVE.qemu.MemoryEdit', { Ext.apply(me, { subject: gettext('Memory'), - items: [ ipanel ], + items: [ipanel], // uncomment the following to use the async configiguration API // backgroundDelay: 5, width: 400, diff --git a/www/manager6/qemu/Monitor.js b/www/manager6/qemu/Monitor.js index 0f415757..d85018e6 100644 --- a/www/manager6/qemu/Monitor.js +++ b/www/manager6/qemu/Monitor.js @@ -5,7 +5,7 @@ Ext.define('PVE.qemu.Monitor', { maxLines: 500, - initComponent : function() { + initComponent: function() { var me = this; var nodename = me.pveSelNode.data.node; @@ -92,7 +92,7 @@ Ext.define('PVE.qemu.Monitor', { textbox, { region: 'south', - margins:'0 5 5 5', + margins: '0 5 5 5', border: false, xtype: 'textfield', name: 'cmd', diff --git a/www/manager6/qemu/NetworkEdit.js b/www/manager6/qemu/NetworkEdit.js index d468b1ae..fed77f4f 100644 --- a/www/manager6/qemu/NetworkEdit.js +++ b/www/manager6/qemu/NetworkEdit.js @@ -55,7 +55,7 @@ Ext.define('PVE.qemu.NetworkInputPanel', { me.bridgesel.setNodename(nodename); }, - initComponent : function() { + initComponent: function() { var me = this; me.network = {}; @@ -172,8 +172,7 @@ Ext.define('PVE.qemu.NetworkEdit', { isAdd: true, - initComponent : function() { - + initComponent: function() { var me = this; var nodename = me.pveSelNode.data.node; diff --git a/www/manager6/qemu/OSDefaults.js b/www/manager6/qemu/OSDefaults.js index 5ea28b29..4af0f5c4 100644 --- a/www/manager6/qemu/OSDefaults.js +++ b/www/manager6/qemu/OSDefaults.js @@ -27,9 +27,8 @@ Ext.define('PVE.qemu.OSDefaults', { if (me.hasOwnProperty(settings.parent)) { 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"); } }; @@ -50,7 +49,7 @@ Ext.define('PVE.qemu.OSDefaults', { // virtio-scsi since 3.2 but backported in RHEL with 2.6 kernel addOS({ pveOS: 'l26', - parent : 'generic', + parent: 'generic', busType: 'scsi', busPriority: { scsi: 4, @@ -64,14 +63,14 @@ Ext.define('PVE.qemu.OSDefaults', { // recommandation from http://wiki.qemu.org/Windows2000 addOS({ pveOS: 'w2k', - parent : 'generic', + parent: 'generic', networkCard: 'rtl8139', scsihw: '', }); // https://pve.proxmox.com/wiki/Windows_XP_Guest_Notes addOS({ pveOS: 'wxp', - parent : 'w2k', + parent: 'w2k', }); me.getDefaults = function(ostype) { diff --git a/www/manager6/qemu/OSTypeEdit.js b/www/manager6/qemu/OSTypeEdit.js index bc70fc4f..ece80c39 100644 --- a/www/manager6/qemu/OSTypeEdit.js +++ b/www/manager6/qemu/OSTypeEdit.js @@ -42,7 +42,7 @@ Ext.define('PVE.qemu.OSTypeInputPanel', { }, }, - initComponent : function() { + initComponent: function() { var me = this; me.items = [ @@ -67,7 +67,7 @@ Ext.define('PVE.qemu.OSTypeInputPanel', { reference: 'ostype', fieldLabel: gettext('Version'), value: 'l26', - allowBlank : false, + allowBlank: false, editable: false, queryMode: 'local', valueField: 'val', @@ -76,7 +76,7 @@ Ext.define('PVE.qemu.OSTypeInputPanel', { fields: ['desc', 'val'], data: PVE.Utils.kvm_ostypes.Linux, listeners: { - datachanged: function (store) { + datachanged: function(store) { var ostype = me.lookup('ostype'); var old_val = ostype.getValue(); if (!me.insideWizard && old_val && store.find('val', old_val) != -1) { @@ -101,7 +101,7 @@ Ext.define('PVE.qemu.OSTypeEdit', { items: [{ xtype: 'pveQemuOSTypePanel' }], - initComponent : function() { + initComponent: function() { var me = this; me.callParent(); diff --git a/www/manager6/qemu/Options.js b/www/manager6/qemu/Options.js index a6b54efb..25a68628 100644 --- a/www/manager6/qemu/Options.js +++ b/www/manager6/qemu/Options.js @@ -4,7 +4,7 @@ Ext.define('PVE.qemu.Options', { onlineHelp: 'qm_options', - initComponent : function() { + initComponent: function() { var me = this; var i; @@ -30,7 +30,7 @@ Ext.define('PVE.qemu.Options', { subject: gettext('Name'), items: { xtype: 'inputpanel', - items:{ + items: { xtype: 'textfield', name: 'name', vtype: 'DnsName', @@ -43,7 +43,7 @@ Ext.define('PVE.qemu.Options', { if (values.name === undefined || values.name === null || values.name === '') { - params = { 'delete':'name'}; + params = { 'delete': 'name' }; } return params; }, @@ -71,8 +71,8 @@ Ext.define('PVE.qemu.Options', { header: gettext('Start/Shutdown order'), defaultValue: '', renderer: PVE.Utils.render_kvm_startup, - editor: caps.vms['VM.Config.Options'] && caps.nodes['Sys.Modify'] ? - { + editor: caps.vms['VM.Config.Options'] && caps.nodes['Sys.Modify'] + ? { xtype: 'pveWindowStartupEdit', onlineHelp: 'qm_startup_and_shutdown', } : undefined, @@ -159,7 +159,7 @@ Ext.define('PVE.qemu.Options', { hotplug: { header: gettext('Hotplug'), defaultValue: 'disk,network,usb', - renderer: PVE.Utils.render_hotplug_features, + renderer: PVE.Utils.render_hotplug_features, editor: caps.vms['VM.Config.HWType'] ? { xtype: 'proxmoxWindowEdit', subject: gettext('Hotplug'), @@ -306,7 +306,7 @@ Ext.define('PVE.qemu.Options', { spice_enhancements: { header: gettext('Spice Enhancements'), defaultValue: false, - renderer: PVE.Utils.render_spice_enhancements, + renderer: PVE.Utils.render_spice_enhancements, editor: caps.vms['VM.Config.Options'] ? { xtype: 'proxmoxWindowEdit', subject: gettext('Spice Enhancements'), @@ -375,7 +375,7 @@ Ext.define('PVE.qemu.Options', { url: "/api2/json/nodes/" + nodename + "/qemu/" + vmid + "/pending", interval: 5000, cwidth1: 250, - tbar: [ edit_btn, revert_btn ], + tbar: [edit_btn, revert_btn], rows: rows, editorConfig: { url: "/api2/extjs/" + baseurl, diff --git a/www/manager6/qemu/PCIEdit.js b/www/manager6/qemu/PCIEdit.js index 3331f761..189bf2a8 100644 --- a/www/manager6/qemu/PCIEdit.js +++ b/www/manager6/qemu/PCIEdit.js @@ -40,10 +40,10 @@ Ext.define('PVE.qemu.PCIInputPanel', { onGetValues: function(values) { var me = this; var ret = {}; - if(!me.confid) { + if (!me.confid) { var i; for (i = 0; i < 5; i++) { - if (!me.vmconfig['hostpci' + i.toString()]) { + if (!me.vmconfig['hostpci' + i.toString()]) { me.confid = 'hostpci' + i.toString(); break; } @@ -125,8 +125,7 @@ Ext.define('PVE.qemu.PCIInputPanel', { var count = 0; pcisel.getStore().each(function(record) { if (record.data.iommugroup === iommu && - record.data.id.substring(0, 5) !== id) - { + record.data.id.substring(0, 5) !== id) { count++; return false; } @@ -221,7 +220,7 @@ Ext.define('PVE.qemu.PCIEdit', { subject: gettext('PCI Device'), - initComponent : function() { + initComponent: function() { var me = this; me.isCreate = !me.confid; @@ -232,7 +231,7 @@ Ext.define('PVE.qemu.PCIEdit', { }); Ext.apply(me, { - items: [ ipanel ], + items: [ipanel], }); me.callParent(); diff --git a/www/manager6/qemu/ProcessorEdit.js b/www/manager6/qemu/ProcessorEdit.js index 425a0af1..5dffbe7a 100644 --- a/www/manager6/qemu/ProcessorEdit.js +++ b/www/manager6/qemu/ProcessorEdit.js @@ -217,7 +217,7 @@ Ext.define('PVE.qemu.ProcessorEdit', { width: 700, - initComponent : function() { + initComponent: function() { var me = this; var ipanel = Ext.create('PVE.qemu.ProcessorInputPanel'); @@ -243,8 +243,7 @@ Ext.define('PVE.qemu.ProcessorEdit', { let caps = Ext.state.Manager.get('GuiCap'); if (data.cputype.indexOf('custom-') === 0 && - !caps.nodes['Sys.Audit']) - { + !caps.nodes['Sys.Audit']) { let vm = ipanel.getViewModel(); vm.set("showCustomModelPermWarning", true); } diff --git a/www/manager6/qemu/RNGEdit.js b/www/manager6/qemu/RNGEdit.js index 50c777f7..8ac0dabf 100644 --- a/www/manager6/qemu/RNGEdit.js +++ b/www/manager6/qemu/RNGEdit.js @@ -103,7 +103,7 @@ Ext.define('PVE.qemu.RNGEdit', { xtype: 'pveRNGInputPanel', }], - initComponent : function() { + initComponent: function() { var me = this; me.callParent(); diff --git a/www/manager6/qemu/SSHKey.js b/www/manager6/qemu/SSHKey.js index 9ea8d834..89eefd49 100644 --- a/www/manager6/qemu/SSHKey.js +++ b/www/manager6/qemu/SSHKey.js @@ -56,7 +56,6 @@ Ext.define('PVE.qemu.SSHKeyInputPanel', { if (!window.FileReader) { me.down('#filebutton').setVisible(false); } - }, }); @@ -65,14 +64,14 @@ Ext.define('PVE.qemu.SSHKeyEdit', { width: 800, - initComponent : function() { + initComponent: function() { var me = this; var ipanel = Ext.create('PVE.qemu.SSHKeyInputPanel'); Ext.apply(me, { subject: gettext('SSH Keys'), - items: [ ipanel ], + items: [ipanel], }); me.callParent(); diff --git a/www/manager6/qemu/ScsiHwEdit.js b/www/manager6/qemu/ScsiHwEdit.js index c1b887bf..70f09c17 100644 --- a/www/manager6/qemu/ScsiHwEdit.js +++ b/www/manager6/qemu/ScsiHwEdit.js @@ -1,7 +1,7 @@ Ext.define('PVE.qemu.ScsiHwEdit', { extend: 'Proxmox.window.Edit', - initComponent : function() { + initComponent: function() { var me = this; Ext.applyIf(me, { diff --git a/www/manager6/qemu/SerialEdit.js b/www/manager6/qemu/SerialEdit.js index 5bc2f6bf..21a7a839 100644 --- a/www/manager6/qemu/SerialEdit.js +++ b/www/manager6/qemu/SerialEdit.js @@ -8,13 +8,12 @@ Ext.define('PVE.qemu.SerialnputPanel', { me.vmconfig = vmconfig; for (i = 0; i < 4; i++) { - var port = 'serial' + i.toString(); + var port = 'serial' + i.toString(); if (!me.vmconfig[port]) { me.down('field[name=serialid]').setValue(i); break; } } - }, onGetValues: function(values) { @@ -57,7 +56,7 @@ Ext.define('PVE.qemu.SerialEdit', { subject: gettext('Serial Port'), - initComponent : function() { + initComponent: function() { var me = this; // for now create of (socket) serial port only @@ -66,7 +65,7 @@ Ext.define('PVE.qemu.SerialEdit', { var ipanel = Ext.create('PVE.qemu.SerialnputPanel', {}); Ext.apply(me, { - items: [ ipanel ], + items: [ipanel], }); me.callParent(); diff --git a/www/manager6/qemu/Smbios1Edit.js b/www/manager6/qemu/Smbios1Edit.js index c55145e7..af64cc07 100644 --- a/www/manager6/qemu/Smbios1Edit.js +++ b/www/manager6/qemu/Smbios1Edit.js @@ -91,8 +91,7 @@ Ext.define('PVE.qemu.Smbios1InputPanel', { Ext.define('PVE.qemu.Smbios1Edit', { extend: 'Proxmox.window.Edit', - initComponent : function() { - + initComponent: function() { var me = this; var ipanel = Ext.create('PVE.qemu.Smbios1InputPanel', {}); diff --git a/www/manager6/qemu/USBEdit.js b/www/manager6/qemu/USBEdit.js index 05df4e7a..6a8b93bd 100644 --- a/www/manager6/qemu/USBEdit.js +++ b/www/manager6/qemu/USBEdit.js @@ -1,6 +1,6 @@ Ext.define('PVE.qemu.USBInputPanel', { extend: 'Proxmox.panel.InputPanel', - mixins: ['Proxmox.Mixin.CBind' ], + mixins: ['Proxmox.Mixin.CBind'], autoComplete: false, onlineHelp: 'qm_usb_passthrough', @@ -121,7 +121,7 @@ Ext.define('PVE.qemu.USBEdit', { width: 400, subject: gettext('USB Device'), - initComponent : function() { + initComponent: function() { var me = this; me.isCreate = !me.confid; @@ -132,7 +132,7 @@ Ext.define('PVE.qemu.USBEdit', { }); Ext.apply(me, { - items: [ ipanel ], + items: [ipanel], }); me.callParent(); @@ -164,7 +164,7 @@ Ext.define('PVE.qemu.USBEdit', { } } var values = { - usb : type, + usb: type, hostdevice: hostdevice, port: port, usb3: usb3, diff --git a/www/manager6/sdn/ControllerView.js b/www/manager6/sdn/ControllerView.js index 0595df87..90a76df3 100644 --- a/www/manager6/sdn/ControllerView.js +++ b/www/manager6/sdn/ControllerView.js @@ -24,7 +24,7 @@ Ext.define('PVE.sdn.ControllerView', { }); }, - initComponent : function() { + initComponent: function() { var me = this; var store = new Ext.data.Store({ @@ -81,7 +81,7 @@ Ext.define('PVE.sdn.ControllerView', { continue; } addMenuItems.push({ - text: PVE.Utils.format_sdncontroller_type(type), + text: PVE.Utils.format_sdncontroller_type(type), iconCls: 'fa fa-fw fa-' + controller.faIcon, handler: addHandleGenerator(type), }); diff --git a/www/manager6/sdn/StatusView.js b/www/manager6/sdn/StatusView.js index 78df7eee..58dc8d2b 100644 --- a/www/manager6/sdn/StatusView.js +++ b/www/manager6/sdn/StatusView.js @@ -8,7 +8,7 @@ Ext.define('PVE.sdn.StatusView', { status: 3, }, - initComponent : function() { + initComponent: function() { var me = this; if (!me.rstore) { @@ -79,10 +79,8 @@ Ext.define('PVE.sdn.StatusView', { me.on('activate', me.rstore.startUpdate); me.on('destroy', me.rstore.stopUpdate); - }, }, function() { - Ext.define('pve-sdn-status', { extend: 'Ext.data.Model', fields: [ @@ -90,5 +88,4 @@ Ext.define('PVE.sdn.StatusView', { ], idProperty: 'id', }); - }); diff --git a/www/manager6/sdn/VnetView.js b/www/manager6/sdn/VnetView.js index 08a43dc6..e2897c9f 100644 --- a/www/manager6/sdn/VnetView.js +++ b/www/manager6/sdn/VnetView.js @@ -7,7 +7,7 @@ Ext.define('PVE.sdn.VnetView', { stateful: true, stateId: 'grid-sdn-vnet', - initComponent : function() { + initComponent: function() { let me = this; let store = new Ext.data.Store({ @@ -122,7 +122,6 @@ Ext.define('PVE.sdn.VnetView', { me.callParent(); }, }, function() { - Ext.define('pve-sdn-vnet', { extend: 'Ext.data.Model', fields: [ @@ -137,5 +136,4 @@ Ext.define('PVE.sdn.VnetView', { ], idProperty: 'vnet', }); - }); diff --git a/www/manager6/sdn/ZoneContentView.js b/www/manager6/sdn/ZoneContentView.js index 8fd365be..ac9f58fc 100644 --- a/www/manager6/sdn/ZoneContentView.js +++ b/www/manager6/sdn/ZoneContentView.js @@ -14,7 +14,7 @@ Ext.define('PVE.sdn.ZoneContentView', { groupHeaderTpl: '{name} ({rows.length} Item{[values.rows.length > 1 ? "s" : ""]})', }, ], - initComponent : function() { + initComponent: function() { var me = this; var nodename = me.pveSelNode.data.node; @@ -78,10 +78,8 @@ Ext.define('PVE.sdn.ZoneContentView', { }); me.callParent(); - }, }, function() { - Ext.define('pve-sdnzone-content', { extend: 'Ext.data.Model', fields: [ @@ -100,5 +98,4 @@ Ext.define('PVE.sdn.ZoneContentView', { ], idProperty: 'vnet', }); - }); diff --git a/www/manager6/sdn/ZoneView.js b/www/manager6/sdn/ZoneView.js index 3c24af3f..4d03a7e7 100644 --- a/www/manager6/sdn/ZoneView.js +++ b/www/manager6/sdn/ZoneView.js @@ -24,7 +24,7 @@ Ext.define('PVE.sdn.ZoneView', { }); }, - initComponent : function() { + initComponent: function() { let me = this; let store = new Ext.data.Store({ @@ -81,7 +81,7 @@ Ext.define('PVE.sdn.ZoneView', { continue; } addMenuItems.push({ - text: PVE.Utils.format_sdnzone_type(type), + text: PVE.Utils.format_sdnzone_type(type), iconCls: 'fa fa-fw fa-' + zone.faIcon, handler: addHandleGenerator(type), }); diff --git a/www/manager6/sdn/controllers/Base.js b/www/manager6/sdn/controllers/Base.js index 11c3b89b..fd8bd9a0 100644 --- a/www/manager6/sdn/controllers/Base.js +++ b/www/manager6/sdn/controllers/Base.js @@ -19,7 +19,7 @@ Ext.define('PVE.panel.SDNControllerBase', { Ext.define('PVE.sdn.controllers.BaseEdit', { extend: 'Proxmox.window.Edit', - initComponent : function() { + initComponent: function() { var me = this; me.isCreate = !me.controllerid; @@ -41,14 +41,14 @@ Ext.define('PVE.sdn.controllers.BaseEdit', { Ext.apply(me, { subject: PVE.Utils.format_sdncontroller_type(me.type), isAdd: true, - items: [ ipanel ], + items: [ipanel], }); me.callParent(); if (!me.isCreate) { me.load({ - success: function(response, options) { + success: function(response, options) { var values = response.result.data; var ctypes = values.content || ''; diff --git a/www/manager6/sdn/controllers/EvpnEdit.js b/www/manager6/sdn/controllers/EvpnEdit.js index 10e358f9..6c90f818 100644 --- a/www/manager6/sdn/controllers/EvpnEdit.js +++ b/www/manager6/sdn/controllers/EvpnEdit.js @@ -3,7 +3,7 @@ Ext.define('PVE.sdn.controllers.EvpnInputPanel', { onlineHelp: 'pvesdn_controller_plugin_evpn', - initComponent : function() { + initComponent: function() { var me = this; me.items = [ diff --git a/www/manager6/sdn/zones/Base.js b/www/manager6/sdn/zones/Base.js index f9200286..1d99ca64 100644 --- a/www/manager6/sdn/zones/Base.js +++ b/www/manager6/sdn/zones/Base.js @@ -15,7 +15,7 @@ Ext.define('PVE.panel.SDNZoneBase', { return values; }, - initComponent : function() { + initComponent: function() { var me = this; me.callParent(); @@ -25,7 +25,7 @@ Ext.define('PVE.panel.SDNZoneBase', { Ext.define('PVE.sdn.zones.BaseEdit', { extend: 'Proxmox.window.Edit', - initComponent : function() { + initComponent: function() { var me = this; me.isCreate = !me.zone; @@ -47,14 +47,14 @@ Ext.define('PVE.sdn.zones.BaseEdit', { Ext.apply(me, { subject: PVE.Utils.format_sdnzone_type(me.type), isAdd: true, - items: [ ipanel ], + items: [ipanel], }); me.callParent(); if (!me.isCreate) { me.load({ - success: function(response, options) { + success: function(response, options) { var values = response.result.data; var ctypes = values.content || ''; diff --git a/www/manager6/sdn/zones/EvpnEdit.js b/www/manager6/sdn/zones/EvpnEdit.js index 7a314c56..d930b95d 100644 --- a/www/manager6/sdn/zones/EvpnEdit.js +++ b/www/manager6/sdn/zones/EvpnEdit.js @@ -15,7 +15,7 @@ Ext.define('PVE.sdn.zones.EvpnInputPanel', { return values; }, - initComponent : function() { + initComponent: function() { var me = this; me.items = [ diff --git a/www/manager6/sdn/zones/QinQEdit.js b/www/manager6/sdn/zones/QinQEdit.js index 5d384775..d9e117d9 100644 --- a/www/manager6/sdn/zones/QinQEdit.js +++ b/www/manager6/sdn/zones/QinQEdit.js @@ -15,7 +15,7 @@ Ext.define('PVE.sdn.zones.QinQInputPanel', { return values; }, - initComponent : function() { + initComponent: function() { let me = this; me.items = [ diff --git a/www/manager6/sdn/zones/SimpleEdit.js b/www/manager6/sdn/zones/SimpleEdit.js index 8518f97e..8cff5e16 100644 --- a/www/manager6/sdn/zones/SimpleEdit.js +++ b/www/manager6/sdn/zones/SimpleEdit.js @@ -15,7 +15,7 @@ Ext.define('PVE.sdn.zones.SimpleInputPanel', { return values; }, - initComponent : function() { + initComponent: function() { var me = this; me.items = [ diff --git a/www/manager6/sdn/zones/VlanEdit.js b/www/manager6/sdn/zones/VlanEdit.js index 8b7eedd7..db1587b7 100644 --- a/www/manager6/sdn/zones/VlanEdit.js +++ b/www/manager6/sdn/zones/VlanEdit.js @@ -15,7 +15,7 @@ Ext.define('PVE.sdn.zones.VlanInputPanel', { return values; }, - initComponent : function() { + initComponent: function() { var me = this; me.items = [ diff --git a/www/manager6/sdn/zones/VxlanEdit.js b/www/manager6/sdn/zones/VxlanEdit.js index 3ee4af8c..5c5b2675 100644 --- a/www/manager6/sdn/zones/VxlanEdit.js +++ b/www/manager6/sdn/zones/VxlanEdit.js @@ -17,7 +17,7 @@ Ext.define('PVE.sdn.zones.VxlanInputPanel', { return values; }, - initComponent : function() { + initComponent: function() { var me = this; me.items = [ diff --git a/www/manager6/storage/Base.js b/www/manager6/storage/Base.js index 9f3d6ee1..186ddc9c 100644 --- a/www/manager6/storage/Base.js +++ b/www/manager6/storage/Base.js @@ -19,7 +19,7 @@ Ext.define('PVE.panel.StorageBase', { return values; }, - initComponent : function() { + initComponent: function() { var me = this; me.column1.unshift({ @@ -71,7 +71,7 @@ Ext.define('PVE.panel.StoragePruneInputPanel', { return { 'prune-backups': 'keep-all=1' }; } delete formValues.delete; - let retention = PVE.Parser.printPropertyString(formValues) + let retention = PVE.Parser.printPropertyString(formValues); if (retention === '') { if (this.isCreate) { return {}; @@ -161,7 +161,7 @@ Ext.define('PVE.storage.BaseEdit', { } }, - initComponent : function() { + initComponent: function() { var me = this; me.isCreate = !me.storageId; @@ -218,7 +218,7 @@ Ext.define('PVE.storage.BaseEdit', { if (!me.isCreate) { me.load({ - success: function(response, options) { + success: function(response, options) { var values = response.result.data; var ctypes = values.content || ''; diff --git a/www/manager6/storage/CephFSEdit.js b/www/manager6/storage/CephFSEdit.js index 2cf308a0..1f5246cd 100644 --- a/www/manager6/storage/CephFSEdit.js +++ b/www/manager6/storage/CephFSEdit.js @@ -17,7 +17,7 @@ Ext.define('PVE.storage.CephFSInputPanel', { this.callParent([values]); }, - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { @@ -55,7 +55,7 @@ Ext.define('PVE.storage.CephFSInputPanel', { xtype: me.isCreate ? 'textfield' : 'displayfield', name: 'username', value: 'admin', - bind: { + bind: { disabled: '{pveceph}', submitValue: '{!pveceph}', }, @@ -80,7 +80,7 @@ Ext.define('PVE.storage.CephFSInputPanel', { xtype: 'proxmoxcheckbox', name: 'pveceph', reference: 'pvecephRef', - bind : { + bind: { disabled: '{!pvecephPossible}', value: '{pveceph}', }, diff --git a/www/manager6/storage/DirEdit.js b/www/manager6/storage/DirEdit.js index 8caa2d25..7e9ec44d 100644 --- a/www/manager6/storage/DirEdit.js +++ b/www/manager6/storage/DirEdit.js @@ -3,7 +3,7 @@ Ext.define('PVE.storage.DirInputPanel', { onlineHelp: 'storage_directory', - initComponent : function() { + initComponent: function() { var me = this; me.column1 = [ diff --git a/www/manager6/storage/GlusterFsEdit.js b/www/manager6/storage/GlusterFsEdit.js index 6a6cadc9..4ea5da26 100644 --- a/www/manager6/storage/GlusterFsEdit.js +++ b/www/manager6/storage/GlusterFsEdit.js @@ -32,7 +32,7 @@ Ext.define('PVE.storage.GlusterFsScan', { me.glusterServer = server; }, - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { @@ -40,7 +40,7 @@ Ext.define('PVE.storage.GlusterFsScan', { } var store = Ext.create('Ext.data.Store', { - fields: [ 'volname' ], + fields: ['volname'], proxy: { type: 'proxmox', url: '/api2/json/nodes/' + me.nodename + '/scan/glusterfs', @@ -62,7 +62,7 @@ Ext.define('PVE.storage.GlusterFsInputPanel', { onlineHelp: 'storage_glusterfs', - initComponent : function() { + initComponent: function() { var me = this; me.column1 = [ diff --git a/www/manager6/storage/IScsiEdit.js b/www/manager6/storage/IScsiEdit.js index df1d1253..2052c05f 100644 --- a/www/manager6/storage/IScsiEdit.js +++ b/www/manager6/storage/IScsiEdit.js @@ -31,7 +31,7 @@ Ext.define('PVE.storage.IScsiScan', { me.portal = portal; }, - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { @@ -39,7 +39,7 @@ Ext.define('PVE.storage.IScsiScan', { } var store = Ext.create('Ext.data.Store', { - fields: [ 'target', 'portal' ], + fields: ['target', 'portal'], proxy: { type: 'proxmox', url: '/api2/json/nodes/' + me.nodename + '/scan/iscsi', @@ -75,7 +75,7 @@ Ext.define('PVE.storage.IScsiInputPanel', { this.callParent([values]); }, - initComponent : function() { + initComponent: function() { var me = this; me.column1 = [ diff --git a/www/manager6/storage/ImageView.js b/www/manager6/storage/ImageView.js index 28ffa48b..e2a6b715 100644 --- a/www/manager6/storage/ImageView.js +++ b/www/manager6/storage/ImageView.js @@ -24,7 +24,7 @@ Ext.define('PVE.storage.ImageView', { var reload = function() { me.store.load(); - } + }; me.tbar = [ { diff --git a/www/manager6/storage/LVMEdit.js b/www/manager6/storage/LVMEdit.js index 42d7173a..2a9cd283 100644 --- a/www/manager6/storage/LVMEdit.js +++ b/www/manager6/storage/LVMEdit.js @@ -5,7 +5,7 @@ Ext.define('PVE.storage.VgSelector', { displayField: 'vg', queryMode: 'local', editable: false, - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { @@ -14,7 +14,7 @@ Ext.define('PVE.storage.VgSelector', { var store = Ext.create('Ext.data.Store', { autoLoad: {}, // true, - fields: [ 'vg', 'size', 'free' ], + fields: ['vg', 'size', 'free'], proxy: { type: 'proxmox', url: '/api2/json/nodes/' + me.nodename + '/scan/lvm', @@ -44,7 +44,7 @@ Ext.define('PVE.storage.BaseStorageSelector', { value: '', valueField: 'storage', displayField: 'text', - initComponent : function() { + initComponent: function() { var me = this; var store = Ext.create('Ext.data.Store', { @@ -54,7 +54,7 @@ Ext.define('PVE.storage.BaseStorageSelector', { type: 'iscsi', }, }, - fields: [ 'storage', 'type', 'content', + fields: ['storage', 'type', 'content', { name: 'text', convert: function(value, record) { @@ -88,7 +88,7 @@ Ext.define('PVE.storage.LVMInputPanel', { onlineHelp: 'storage_lvm', - initComponent : function() { + initComponent: function() { var me = this; me.column1 = []; diff --git a/www/manager6/storage/LvmThinEdit.js b/www/manager6/storage/LvmThinEdit.js index 238c8c17..97248f11 100644 --- a/www/manager6/storage/LvmThinEdit.js +++ b/www/manager6/storage/LvmThinEdit.js @@ -28,7 +28,7 @@ Ext.define('PVE.storage.TPoolSelector', { me.vg = myvg; }, - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { @@ -36,7 +36,7 @@ Ext.define('PVE.storage.TPoolSelector', { } var store = Ext.create('Ext.data.Store', { - fields: [ 'lv' ], + fields: ['lv'], proxy: { type: 'proxmox', url: '/api2/json/nodes/' + me.nodename + '/scan/lvmthin', @@ -64,7 +64,7 @@ Ext.define('PVE.storage.BaseVGSelector', { displayField: 'vg', queryMode: 'local', editable: false, - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { @@ -73,7 +73,7 @@ Ext.define('PVE.storage.BaseVGSelector', { var store = Ext.create('Ext.data.Store', { autoLoad: {}, - fields: [ 'vg', 'size', 'free'], + fields: ['vg', 'size', 'free'], proxy: { type: 'proxmox', url: '/api2/json/nodes/' + me.nodename + '/scan/lvm', @@ -96,7 +96,7 @@ Ext.define('PVE.storage.LvmThinInputPanel', { onlineHelp: 'storage_lvmthin', - initComponent : function() { + initComponent: function() { var me = this; me.column1 = []; diff --git a/www/manager6/storage/NFSEdit.js b/www/manager6/storage/NFSEdit.js index 807a9c52..d582997e 100644 --- a/www/manager6/storage/NFSEdit.js +++ b/www/manager6/storage/NFSEdit.js @@ -32,7 +32,7 @@ Ext.define('PVE.storage.NFSScan', { me.nfsServer = server; }, - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { @@ -40,7 +40,7 @@ Ext.define('PVE.storage.NFSScan', { } var store = Ext.create('Ext.data.Store', { - fields: [ 'path', 'options' ], + fields: ['path', 'options'], proxy: { type: 'proxmox', url: '/api2/json/nodes/' + me.nodename + '/scan/nfs', @@ -62,7 +62,7 @@ Ext.define('PVE.storage.NFSInputPanel', { onlineHelp: 'storage_nfs', - options : [], + options: [], onGetValues: function(values) { var me = this; @@ -105,7 +105,7 @@ Ext.define('PVE.storage.NFSInputPanel', { return me.callParent([values]); }, - initComponent : function() { + initComponent: function() { var me = this; diff --git a/www/manager6/storage/PBSEdit.js b/www/manager6/storage/PBSEdit.js index e7585de0..2479304a 100644 --- a/www/manager6/storage/PBSEdit.js +++ b/www/manager6/storage/PBSEdit.js @@ -211,7 +211,7 @@ Ext.define('PVE.panel.PBSEncryptionKeyTab', { let cryptKeyInfo = values['encryption-key']; if (cryptKeyInfo) { - let icon = ' ' + let icon = ' '; if (cryptKeyInfo.match(/^[a-fA-F0-9]{2}:/)) { // new style fingerprint let shortKeyFP = PVE.Utils.render_pbs_fingerprint(cryptKeyInfo); values['crypt-key-fp'] = icon + `${gettext('Active')} - ${gettext('Fingerprint')} ${shortKeyFP}`; diff --git a/www/manager6/storage/RBDEdit.js b/www/manager6/storage/RBDEdit.js index 4732ee6a..be29dc8a 100644 --- a/www/manager6/storage/RBDEdit.js +++ b/www/manager6/storage/RBDEdit.js @@ -91,7 +91,7 @@ Ext.define('PVE.storage.RBDInputPanel', { this.callParent([values]); }, - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { @@ -194,7 +194,7 @@ Ext.define('PVE.storage.RBDInputPanel', { xtype: 'proxmoxcheckbox', name: 'pveceph', reference: 'pvecephRef', - bind : { + bind: { disabled: '{!pvecephPossible}', value: '{pveceph}', }, diff --git a/www/manager6/storage/Summary.js b/www/manager6/storage/Summary.js index f131d3ce..bc61139d 100644 --- a/www/manager6/storage/Summary.js +++ b/www/manager6/storage/Summary.js @@ -29,13 +29,13 @@ Ext.define('PVE.storage.Summary', { throw "no storage ID specified"; } - var rstore = Ext.create('Proxmox.data.ObjectStore', { + var rstore = Ext.create('Proxmox.data.ObjectStore', { url: "/api2/json/nodes/" + nodename + "/storage/" + storage + "/status", interval: 1000, }); var rrdstore = Ext.create('Proxmox.data.RRDStore', { - rrdurl: "/api2/json/nodes/" + nodename + "/storage/" + storage + "/rrddata", + rrdurl: "/api2/json/nodes/" + nodename + "/storage/" + storage + "/rrddata", model: 'pve-rrd-storage', }); diff --git a/www/manager6/storage/TemplateView.js b/www/manager6/storage/TemplateView.js index f79af9a9..c5fda247 100644 --- a/www/manager6/storage/TemplateView.js +++ b/www/manager6/storage/TemplateView.js @@ -8,7 +8,7 @@ Ext.define('PVE.grid.TemplateSelector', { viewConfig: { trackOver: false, }, - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { @@ -53,14 +53,14 @@ 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); }); }, }, }, ], - features: [ groupingFeature ], + features: [groupingFeature], columns: [ { header: gettext('Type'), @@ -93,7 +93,6 @@ Ext.define('PVE.grid.TemplateSelector', { }, }, function() { - Ext.define('pve-aplinfo', { extend: 'Ext.data.Model', fields: [ @@ -102,7 +101,6 @@ Ext.define('PVE.grid.TemplateSelector', { ], idProperty: 'template', }); - }); Ext.define('PVE.storage.TemplateDownload', { @@ -114,7 +112,7 @@ Ext.define('PVE.storage.TemplateDownload', { layout: 'fit', width: 900, height: 600, - initComponent : function() { + initComponent: function() { var me = this; var grid = Ext.create('PVE.grid.TemplateSelector', { @@ -137,7 +135,7 @@ Ext.define('PVE.storage.TemplateDownload', { template: rec.data.template, }, method: 'POST', - failure: function (response, opts) { + failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); }, success: function(response, options) { @@ -158,7 +156,7 @@ Ext.define('PVE.storage.TemplateDownload', { Ext.apply(me, { items: grid, - buttons: [ submitBtn ], + buttons: [submitBtn], }); me.callParent(); @@ -189,7 +187,7 @@ Ext.define('PVE.storage.TemplateView', { var reload = function() { me.store.load(); - } + }; var templateButton = Ext.create('Proxmox.button.Button', { itemId: 'tmpl-btn', @@ -204,7 +202,7 @@ Ext.define('PVE.storage.TemplateView', { }, }); - me.tbar = [ templateButton ]; + me.tbar = [templateButton]; me.useUploadButton = true; me.callParent(); diff --git a/www/manager6/storage/ZFSEdit.js b/www/manager6/storage/ZFSEdit.js index 54be7e98..e348d1a1 100644 --- a/www/manager6/storage/ZFSEdit.js +++ b/www/manager6/storage/ZFSEdit.js @@ -43,7 +43,7 @@ Ext.define('PVE.storage.ZFSInputPanel', { this.callParent([values]); }, - initComponent : function() { + initComponent: function() { var me = this; me.column1 = [ diff --git a/www/manager6/storage/ZFSPoolEdit.js b/www/manager6/storage/ZFSPoolEdit.js index a5c41270..8e689f0c 100644 --- a/www/manager6/storage/ZFSPoolEdit.js +++ b/www/manager6/storage/ZFSPoolEdit.js @@ -8,7 +8,7 @@ Ext.define('PVE.storage.ZFSPoolSelector', { listConfig: { loadingText: gettext('Scanning...'), }, - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { @@ -17,7 +17,7 @@ Ext.define('PVE.storage.ZFSPoolSelector', { var store = Ext.create('Ext.data.Store', { autoLoad: {}, // true, - fields: [ 'pool', 'size', 'free' ], + fields: ['pool', 'size', 'free'], proxy: { type: 'proxmox', url: '/api2/json/nodes/' + me.nodename + '/scan/zfs', @@ -39,7 +39,7 @@ Ext.define('PVE.storage.ZFSPoolInputPanel', { onlineHelp: 'storage_zfspool', - initComponent : function() { + initComponent: function() { var me = this; me.column1 = []; @@ -62,7 +62,8 @@ Ext.define('PVE.storage.ZFSPoolInputPanel', { // value is an array, // while before it was a string me.column1.push( - {xtype: 'pveContentTypeSelector', + { +xtype: 'pveContentTypeSelector', cts: ['images', 'rootdir'], fieldLabel: gettext('Content'), name: 'content', diff --git a/www/manager6/tree/ResourceTree.js b/www/manager6/tree/ResourceTree.js index befd0d4c..cac8aae4 100644 --- a/www/manager6/tree/ResourceTree.js +++ b/www/manager6/tree/ResourceTree.js @@ -47,7 +47,6 @@ Ext.define('PVE.tree.ResourceTree', { if ((n1.groupbyid && n2.groupbyid) || !(n1.groupbyid || n2.groupbyid)) { - var tcmp; var v1 = n1.type; @@ -198,7 +197,7 @@ Ext.define('PVE.tree.ResourceTree', { } else { groupinfo = { type: groupby, - id : groupby + "/" + v, + id: groupby + "/" + v, }; if (groupby !== 'type') { groupinfo[groupby] = v; @@ -219,7 +218,7 @@ Ext.define('PVE.tree.ResourceTree', { return me.addChildSorted(node, info); }, - initComponent : function() { + initComponent: function() { var me = this; var rstore = PVE.data.ResourceStore; @@ -419,13 +418,13 @@ Ext.define('PVE.tree.ResourceTree', { destroy: function() { rstore.un("load", updateTree); }, - beforecellmousedown: function (tree, td, cellIndex, record, tr, rowIndex, ev) { + beforecellmousedown: function(tree, td, cellIndex, record, tr, rowIndex, ev) { var sm = me.getSelectionModel(); // disable selection when right clicking // except the record is already selected me.allowSelection = (ev.button !== 2) || sm.isSelected(record); }, - beforeselect: function (tree, record, index, eopts) { + beforeselect: function(tree, record, index, eopts) { var allow = me.allowSelection; me.allowSelection = true; return allow; @@ -484,7 +483,7 @@ Ext.define('PVE.tree.ResourceTree', { } return node; }, - applyState : function(state) { + applyState: function(state) { var sm = me.getSelectionModel(); if (state && state.value) { me.selectById(state.value); @@ -498,7 +497,7 @@ Ext.define('PVE.tree.ResourceTree', { var sm = me.getSelectionModel(); sm.on('select', function(sm, n) { - sp.set(stateid, { value: n.data.id}); + sp.set(stateid, { value: n.data.id }); }); rstore.on("load", updateTree); diff --git a/www/manager6/tree/SnapshotTree.js b/www/manager6/tree/SnapshotTree.js index d64eabb9..b7f98aef 100644 --- a/www/manager6/tree/SnapshotTree.js +++ b/www/manager6/tree/SnapshotTree.js @@ -79,7 +79,7 @@ Ext.define('PVE.guest.SnapshotTree', { callback: function() { me.reload(); }, - failure: function (response, opts) { + failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); }, success: function(response, options) { @@ -260,7 +260,7 @@ Ext.define('PVE.guest.SnapshotTree', { let rec = view.getSelection()[0]; let vmid = view.getViewModel().get('vmid'); return Proxmox.Utils.format_task_description('qmrollback', vmid) + - " '" + rec.data.name + "'"; + " '" + rec.data.name + "'"; }, handler: 'rollback', }, diff --git a/www/manager6/window/Backup.js b/www/manager6/window/Backup.js index 4cc41f98..f3990633 100644 --- a/www/manager6/window/Backup.js +++ b/www/manager6/window/Backup.js @@ -3,7 +3,7 @@ Ext.define('PVE.window.Backup', { resizable: false, - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { @@ -75,7 +75,7 @@ Ext.define('PVE.window.Backup', { var submitBtn = Ext.create('Ext.Button', { text: gettext('Backup'), - handler: function(){ + handler: function() { var storage = storagesel.getValue(); var values = form.getValues(); var params = { @@ -85,7 +85,7 @@ Ext.define('PVE.window.Backup', { remove: 0, }; - if ( values.mailto ) { + if (values.mailto) { params.mailto = values.mailto; } @@ -97,7 +97,7 @@ Ext.define('PVE.window.Backup', { url: '/nodes/' + me.nodename + '/vzdump', params: params, method: 'POST', - failure: function (response, opts) { + failure: function(response, opts) { Ext.Msg.alert('Error', response.htmlStatus); }, success: function(response, options) { @@ -137,8 +137,8 @@ Ext.define('PVE.window.Backup', { modal: true, layout: 'auto', border: false, - items: [ me.formPanel ], - buttons: [ helpBtn, '->', submitBtn ], + items: [me.formPanel], + buttons: [helpBtn, '->', submitBtn], }); me.callParent(); diff --git a/www/manager6/window/BulkAction.js b/www/manager6/window/BulkAction.js index a2005b56..de8ef255 100644 --- a/www/manager6/window/BulkAction.js +++ b/www/manager6/window/BulkAction.js @@ -42,7 +42,7 @@ Ext.define('PVE.window.BulkAction', { }); }, - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { @@ -167,8 +167,8 @@ Ext.define('PVE.window.BulkAction', { }); Ext.apply(me, { - items: [ me.formPanel ], - buttons: [ submitBtn ], + items: [me.formPanel], + buttons: [submitBtn], }); me.callParent(); diff --git a/www/manager6/window/CephInstall.js b/www/manager6/window/CephInstall.js index 2f8e64f2..27d1935e 100644 --- a/www/manager6/window/CephInstall.js +++ b/www/manager6/window/CephInstall.js @@ -25,14 +25,14 @@ Ext.define('PVE.ceph.Install', { isInstalled: false, }, formulas: { - buttonText: function (get){ + buttonText: function(get) { if (get('isInstalled')) { return gettext('Configure Ceph'); } else { return gettext('Install Ceph'); } }, - windowText: function (get) { + windowText: function(get) { if (get('isInstalled')) { return '

' + Ext.String.format(gettext('{0} is not initialized.'), 'Ceph') + ' '+ @@ -71,11 +71,10 @@ Ext.define('PVE.ceph.Install', { }); win.getViewModel().set('isInstalled', this.getViewModel().get('isInstalled')); win.show(); - me.mon(win, 'beforeClose', function(){ + me.mon(win, 'beforeClose', function() { me.fireEvent("cephInstallWindowClosed"); me.close(); }); - }, }, ], diff --git a/www/manager6/window/Clone.js b/www/manager6/window/Clone.js index 3a69ec30..c357fc7e 100644 --- a/www/manager6/window/Clone.js +++ b/www/manager6/window/Clone.js @@ -91,7 +91,6 @@ Ext.define('PVE.window.Clone', { me.close(); }, }); - }, // disable the Storage selector when clone mode is linked clone @@ -133,7 +132,7 @@ Ext.define('PVE.window.Clone', { }); }, - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { @@ -231,7 +230,7 @@ Ext.define('PVE.window.Clone', { hidden: me.isTemplate || !me.hasSnapshots ? true : false, disabled: false, allowBlank: false, - value : me.snapname, + value: me.snapname, listeners: { change: function(f, value) { me.verifyFeature(); @@ -284,7 +283,7 @@ Ext.define('PVE.window.Clone', { height: 250, border: false, layout: 'fit', - buttons: [ { + buttons: [{ xtype: 'proxmoxHelpButton', listenToGlobalEvent: false, hidden: false, @@ -301,8 +300,8 @@ Ext.define('PVE.window.Clone', { me.create_clone(cloneForm.getValues()); } }, - } ], - items: [ formPanel ], + }], + items: [formPanel], }); me.callParent(); diff --git a/www/manager6/window/LoginWindow.js b/www/manager6/window/LoginWindow.js index 76ea36bc..72078080 100644 --- a/www/manager6/window/LoginWindow.js +++ b/www/manager6/window/LoginWindow.js @@ -30,10 +30,10 @@ Ext.define('PVE.window.LoginWindow', { sp.set(saveunField.getStateId(), saveunField.getValue()); form.submit({ - failure: function(f, resp){ + failure: function(f, resp) { me.failure(resp); }, - success: function(f, resp){ + success: function(f, resp) { view.el.unmask(); var data = resp.result.data; @@ -52,7 +52,6 @@ Ext.define('PVE.window.LoginWindow', { } }, }); - }, failure: function(resp) { var me = this; @@ -175,7 +174,7 @@ Ext.define('PVE.window.LoginWindow', { var checked = sp.get(checkboxField.getStateId()); checkboxField.setValue(checked); - if(checked === true) { + if (checked === true) { var username = sp.get(unField.getStateId()); unField.setValue(username); var pwField = this.lookupReference('passwordField'); diff --git a/www/manager6/window/Migrate.js b/www/manager6/window/Migrate.js index 8f26c27d..9c03e231 100644 --- a/www/manager6/window/Migrate.js +++ b/www/manager6/window/Migrate.js @@ -34,7 +34,7 @@ Ext.define('PVE.window.Migrate', { formulas: { setMigrationMode: function(get) { - if (get('running')){ + if (get('running')) { if (get('vmtype') === 'qemu') { return gettext('Online'); } else { @@ -101,10 +101,9 @@ Ext.define('PVE.window.Migrate', { }); me.checkMigratePreconditions(); me.lookup('formPanel').isValid(); - }, - onTargetChange: function (nodeSelector) { + onTargetChange: function(nodeSelector) { //Always display the storages of the currently seleceted migration target this.lookup('pveDiskStorageSelector').setNodename(nodeSelector.value); this.checkMigratePreconditions(); @@ -156,7 +155,6 @@ Ext.define('PVE.window.Migrate', { view.close(); }, }); - }, checkMigratePreconditions: function(resetMigrationPossible) { @@ -181,7 +179,6 @@ Ext.define('PVE.window.Migrate', { me.lookup('pveNodeSelector').allowedNodes = vm.get('migration.allowedNodes'); me.lookup('formPanel').isValid(); - }, checkQemuPreconditions: function(resetMigrationPossible) { @@ -228,7 +225,7 @@ Ext.define('PVE.window.Migrate', { if (migrateStats.local_resources.length) { migration.hasLocalResources = true; - if(!migration.overwriteLocalResourceCheck || vm.get('running')){ + if (!migration.overwriteLocalResourceCheck || vm.get('running')) { migration.possible = false; migration.preconditions.push({ text: Ext.String.format('Can\'t migrate VM with local resources: {0}', @@ -246,8 +243,7 @@ Ext.define('PVE.window.Migrate', { } if (migrateStats.local_disks.length) { - - migrateStats.local_disks.forEach(function (disk) { + migrateStats.local_disks.forEach(function(disk) { if (disk.cdrom && disk.cdrom === 1) { if (disk.volid.includes('vm-'+vm.get('vmid')+'-cloudinit')) { if (migrateStats.running) { @@ -276,11 +272,9 @@ Ext.define('PVE.window.Migrate', { }); } }); - } vm.set('migration', migration); - }, }); }, @@ -371,7 +365,7 @@ Ext.define('PVE.window.Migrate', { value: '{migration.overwriteLocalResourceCheck}', }, listeners: { - change: {fn: 'checkMigratePreconditions', extraArg: true}, + change: { fn: 'checkMigratePreconditions', extraArg: true }, }, }], }, diff --git a/www/manager6/window/Restore.js b/www/manager6/window/Restore.js index 088c4267..dac883f1 100644 --- a/www/manager6/window/Restore.js +++ b/www/manager6/window/Restore.js @@ -3,7 +3,7 @@ Ext.define('PVE.window.Restore', { resizable: false, - initComponent : function() { + initComponent: function() { var me = this; if (!me.nodename) { @@ -119,7 +119,7 @@ Ext.define('PVE.window.Restore', { params: params, method: 'POST', waitMsgTarget: me, - failure: function (response, opts) { + failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); }, success: function(response, options) { @@ -136,7 +136,7 @@ Ext.define('PVE.window.Restore', { var submitBtn = Ext.create('Ext.Button', { text: gettext('Restore'), - handler: function(){ + handler: function() { var values = form.getValues(); var params = { @@ -185,7 +185,7 @@ Ext.define('PVE.window.Restore', { submitBtn.setDisabled(!valid); }); - var title = gettext('Restore') + ": " + ( + var title = gettext('Restore') + ": " + ( (me.vmtype === 'lxc') ? 'CT' : 'VM'); if (me.vmid) { @@ -198,8 +198,8 @@ Ext.define('PVE.window.Restore', { modal: true, layout: 'auto', border: false, - items: [ me.formPanel ], - buttons: [ submitBtn ], + items: [me.formPanel], + buttons: [submitBtn], }); me.callParent(); diff --git a/www/manager6/window/SafeDestroy.js b/www/manager6/window/SafeDestroy.js index 12b086d2..bf6f2cdf 100644 --- a/www/manager6/window/SafeDestroy.js +++ b/www/manager6/window/SafeDestroy.js @@ -11,7 +11,7 @@ Ext.define('PVE.window.SafeDestroy', { buttonAlign: 'center', bodyPadding: 10, width: 450, - layout: { type:'hbox' }, + layout: { type: 'hbox' }, defaultFocus: 'confirmField', showProgress: false, @@ -51,7 +51,7 @@ Ext.define('PVE.window.SafeDestroy', { removeButton.disable(); } }, - specialkey: function (field, event) { + specialkey: function(field, event) { var removeButton = this.lookupReference('removeButton'); if (!removeButton.isDisabled() && event.getKey() == event.ENTER) { removeButton.fireEvent('click', removeButton, event); @@ -82,7 +82,7 @@ Ext.define('PVE.window.SafeDestroy', { var win = Ext.create('Proxmox.window.TaskProgress', { upid: upid, listeners: { - destroy: function () { + destroy: function() { view.close(); }, }, @@ -101,7 +101,7 @@ Ext.define('PVE.window.SafeDestroy', { items: [ { xtype: 'component', - cls: [ Ext.baseCSSPrefix + 'message-box-icon', + cls: [Ext.baseCSSPrefix + 'message-box-icon', Ext.baseCSSPrefix + 'message-box-warning', Ext.baseCSSPrefix + 'dlg-icon'], }, @@ -148,7 +148,7 @@ Ext.define('PVE.window.SafeDestroy', { }, ], - initComponent : function() { + initComponent: function() { var me = this; me.callParent(); diff --git a/www/manager6/window/Settings.js b/www/manager6/window/Settings.js index 0643c154..c92d2a25 100644 --- a/www/manager6/window/Settings.js +++ b/www/manager6/window/Settings.js @@ -103,7 +103,7 @@ Ext.define('PVE.window.Settings', { }, }, 'button[name=reset]': { - click: function () { + click: function() { var blacklist = ['GuiCap', 'login-username', 'dash-storages']; var sp = Ext.state.Manager.getProvider(); var state; @@ -121,7 +121,7 @@ Ext.define('PVE.window.Settings', { }, }, 'button[name=clear-username]': { - click: function () { + click: function() { var me = this; var usernamefield = me.lookupReference('savedUserName'); var sp = Ext.state.Manager.getProvider(); @@ -152,7 +152,7 @@ Ext.define('PVE.window.Settings', { var items = []; me.suspendEvent('selectionchange'); var storages = sp.get('dash-storages') || ''; - storages.split(',').forEach(function(storage){ + storages.split(',').forEach(function(storage) { // we have to get the records // to be able to select them if (storage !== '') { @@ -224,16 +224,16 @@ Ext.define('PVE.window.Settings', { property: 'type', value: 'storage', }], - sorters: [ 'node', 'storage'], + sorters: ['node', 'storage'], }, }, { xtype: 'box', - autoEl: { tag: 'hr'}, + autoEl: { tag: 'hr' }, }, { xtype: 'container', - layout: 'hbox', + layout: 'hbox', items: [ { xtype: 'displayfield', @@ -254,7 +254,7 @@ Ext.define('PVE.window.Settings', { }, { xtype: 'box', - autoEl: { tag: 'hr'}, + autoEl: { tag: 'hr' }, }, { xtype: 'container', @@ -276,7 +276,7 @@ Ext.define('PVE.window.Settings', { }, { xtype: 'box', - autoEl: { tag: 'hr'}, + autoEl: { tag: 'hr' }, }, { xtype: 'proxmoxKVComboBox', @@ -316,7 +316,7 @@ Ext.define('PVE.window.Settings', { // is shown margin: '0 2 10 0', }, - items:[ + items: [ { xtype: 'fieldset', itemId: 'xtermjs', diff --git a/www/manager6/window/Snapshot.js b/www/manager6/window/Snapshot.js index ff9ab9e0..2fa97041 100644 --- a/www/manager6/window/Snapshot.js +++ b/www/manager6/window/Snapshot.js @@ -24,7 +24,7 @@ Ext.define('PVE.window.Snapshot', { return values; }, - initComponent : function() { + initComponent: function() { var me = this; var vm = me.getViewModel(); @@ -113,7 +113,7 @@ Ext.define('PVE.window.Snapshot', { model: 'KeyValue', sorters: [ { - property : 'key', + property: 'key', direction: 'ASC', }, ], diff --git a/www/manager6/window/StartupEdit.js b/www/manager6/window/StartupEdit.js index 2b908eb0..c1d8838a 100644 --- a/www/manager6/window/StartupEdit.js +++ b/www/manager6/window/StartupEdit.js @@ -23,7 +23,7 @@ Ext.define('PVE.panel.StartupInputPanel', { } }, - initComponent : function() { + initComponent: function() { var me = this; me.items = [ @@ -59,10 +59,9 @@ Ext.define('PVE.window.StartupEdit', { alias: 'widget.pveWindowStartupEdit', onlineHelp: undefined, - initComponent : function() { - + initComponent: function() { var me = this; - var ipanelConfig = me.onlineHelp ? {onlineHelp: me.onlineHelp} : {}; + var ipanelConfig = me.onlineHelp ? { onlineHelp: me.onlineHelp } : {}; var ipanel = Ext.create('PVE.panel.StartupInputPanel', ipanelConfig); Ext.applyIf(me, { @@ -70,7 +69,7 @@ Ext.define('PVE.window.StartupEdit', { fieldDefaults: { labelWidth: 120, }, - items: [ ipanel ], + items: [ipanel], }); me.callParent(); diff --git a/www/manager6/window/Wizard.js b/www/manager6/window/Wizard.js index 5acb86a7..8b930bbd 100644 --- a/www/manager6/window/Wizard.js +++ b/www/manager6/window/Wizard.js @@ -79,7 +79,7 @@ Ext.define('PVE.window.Wizard', { var disable_at = function(card) { var tp = me.down('#wizcontent'); var idx = tp.items.indexOf(card); - for(;idx < tp.items.getCount();idx++) { + for (;idx < tp.items.getCount(); idx++) { var nc = tp.items.getAt(idx); if (nc) { nc.disable(); @@ -196,7 +196,6 @@ Ext.define('PVE.window.Wizard', { itemId: 'next', minWidth: 60, handler: function() { - var form = me.down('form').getForm(); var tp = me.down('#wizcontent'); @@ -211,7 +210,6 @@ Ext.define('PVE.window.Wizard', { ntab.enable(); tp.setActiveTab(ntab); } - }, }, { -- 2.39.2