From 2a4971d8c93e440c548efa139c639b73b3b41ddb Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 19 Jan 2021 17:29:55 +0100 Subject: [PATCH] ui: eslint: fix trailing spaces Signed-off-by: Thomas Lamprecht --- www/manager6/dc/GroupView.js | 6 ++-- www/manager6/dc/Log.js | 42 +++++++++++----------- www/manager6/dc/PoolView.js | 6 ++-- www/manager6/dc/SecurityGroups.js | 6 ++-- www/manager6/dc/Support.js | 8 ++--- www/manager6/dc/UserEdit.js | 10 +++--- www/manager6/dc/UserView.js | 10 +++--- www/manager6/form/BridgeSelector.js | 2 +- www/manager6/form/BusTypeSelector.js | 2 +- www/manager6/form/IPRefSelector.js | 4 +-- www/manager6/form/MemoryField.js | 4 +-- www/manager6/form/SecurityGroupSelector.js | 2 +- www/manager6/form/StorageSelector.js | 8 ++--- www/manager6/form/VLanField.js | 4 +-- www/manager6/form/ViewSelector.js | 6 ++-- www/manager6/grid/BackupView.js | 8 ++--- www/manager6/grid/FirewallRules.js | 14 ++++---- www/manager6/grid/ResourceGrid.js | 14 ++++---- www/manager6/ha/Fencing.js | 2 +- www/manager6/ha/GroupEdit.js | 6 ++-- www/manager6/ha/GroupSelector.js | 8 ++--- www/manager6/ha/Groups.js | 10 +++--- www/manager6/ha/ResourceEdit.js | 10 +++--- www/manager6/ha/Resources.js | 8 ++--- www/manager6/ha/StatusView.js | 6 ++-- www/manager6/lxc/Network.js | 2 +- www/manager6/lxc/Options.js | 2 +- www/manager6/lxc/ResourceEdit.js | 2 +- www/manager6/lxc/Resources.js | 4 +-- www/manager6/panel/IPSet.js | 2 +- www/manager6/panel/StatusPanel.js | 4 +-- www/manager6/pool/StatusView.js | 2 +- www/manager6/pool/Summary.js | 2 +- www/manager6/qemu/CDEdit.js | 12 +++---- www/manager6/qemu/HardwareView.js | 10 +++--- www/manager6/qemu/MemoryEdit.js | 2 +- www/manager6/qemu/Monitor.js | 4 +-- www/manager6/qemu/NetworkEdit.js | 6 ++-- www/manager6/qemu/Smbios1Edit.js | 2 +- www/manager6/sdn/StatusView.js | 2 +- www/manager6/storage/LVMEdit.js | 2 +- www/manager6/tree/ResourceTree.js | 10 +++--- www/manager6/window/Backup.js | 4 +-- www/manager6/window/Restore.js | 2 +- www/manager6/window/StartupEdit.js | 2 +- www/manager6/window/Wizard.js | 12 +++---- 46 files changed, 148 insertions(+), 148 deletions(-) diff --git a/www/manager6/dc/GroupView.js b/www/manager6/dc/GroupView.js index 960ad114..0df36362 100644 --- a/www/manager6/dc/GroupView.js +++ b/www/manager6/dc/GroupView.js @@ -13,9 +13,9 @@ Ext.define('PVE.dc.GroupView', { var store = new Ext.data.Store({ model: 'pve-groups', - sorters: { - property: 'groupid', - order: 'DESC' + sorters: { + property: 'groupid', + order: 'DESC' } }); diff --git a/www/manager6/dc/Log.js b/www/manager6/dc/Log.js index fa58c08a..7eb691bf 100644 --- a/www/manager6/dc/Log.js +++ b/www/manager6/dc/Log.js @@ -21,7 +21,7 @@ Ext.define('PVE.dc.Log', { var store = Ext.create('Proxmox.data.DiffStore', { rstore: logstore, - appendAtStart: true + appendAtStart: true }); Ext.apply(me, { @@ -31,7 +31,7 @@ Ext.define('PVE.dc.Log', { viewConfig: { trackOver: false, stripeRows: true, - + getRowClass: function(record, index) { var pri = record.get('pri'); @@ -42,46 +42,46 @@ Ext.define('PVE.dc.Log', { }, sortableColumns: false, columns: [ - { - header: gettext("Time"), + { + header: gettext("Time"), dataIndex: 'time', width: 150, - renderer: function(value) { - return Ext.Date.format(value, "M d H:i:s"); + renderer: function(value) { + return Ext.Date.format(value, "M d H:i:s"); } }, - { - header: gettext("Node"), + { + header: gettext("Node"), dataIndex: 'node', width: 150 }, - { - header: gettext("Service"), + { + header: gettext("Service"), dataIndex: 'tag', width: 100 }, - { - header: "PID", + { + header: "PID", dataIndex: 'pid', - width: 100 + width: 100 }, - { - header: gettext("User name"), + { + header: gettext("User name"), dataIndex: 'user', renderer: Ext.String.htmlEncode, width: 150 }, - { - header: gettext("Severity"), + { + header: gettext("Severity"), dataIndex: 'pri', renderer: PVE.Utils.render_serverity, - width: 100 + width: 100 }, - { - header: gettext("Message"), + { + header: gettext("Message"), dataIndex: 'msg', renderer: Ext.String.htmlEncode, - flex: 1 + flex: 1 } ], listeners: { diff --git a/www/manager6/dc/PoolView.js b/www/manager6/dc/PoolView.js index 205a3e6e..5ffe277a 100644 --- a/www/manager6/dc/PoolView.js +++ b/www/manager6/dc/PoolView.js @@ -13,9 +13,9 @@ Ext.define('PVE.dc.PoolView', { var store = new Ext.data.Store({ model: 'pve-pools', - sorters: { - property: 'poolid', - order: 'DESC' + sorters: { + property: 'poolid', + order: 'DESC' } }); diff --git a/www/manager6/dc/SecurityGroups.js b/www/manager6/dc/SecurityGroups.js index 90adfa1c..016462bb 100644 --- a/www/manager6/dc/SecurityGroups.js +++ b/www/manager6/dc/SecurityGroups.js @@ -21,8 +21,8 @@ Ext.define('PVE.SecurityGroupEdit', { me.url = '/api2/extjs' + me.base_url; me.method = 'POST'; - - var items = [ + + var items = [ { xtype: 'textfield', name: 'group', @@ -52,7 +52,7 @@ Ext.define('PVE.SecurityGroupEdit', { var ipanel = Ext.create('Proxmox.panel.InputPanel', { // InputPanel does not have a 'create' property, does it need a 'isCreate' isCreate: me.isCreate, - items: items + items: items }); diff --git a/www/manager6/dc/Support.js b/www/manager6/dc/Support.js index 8a29da63..d1dcc0dd 100644 --- a/www/manager6/dc/Support.js +++ b/www/manager6/dc/Support.js @@ -24,8 +24,8 @@ Ext.define('PVE.dc.Support', { updateActive: function(data) { var me = this; - - var html = '

' + data.productname + '

' + me.activeHtml; + + var html = '

' + data.productname + '

' + me.activeHtml; html += '

' + me.docuHtml(); html += '

' + me.bugzillaHtml; @@ -35,13 +35,13 @@ Ext.define('PVE.dc.Support', { updateCommunity: function(data) { var me = this; - var html = '

' + data.productname + '

' + me.communityHtml; + var html = '

' + data.productname + '

' + me.communityHtml; html += '

' + me.docuHtml(); html += '

' + me.bugzillaHtml; me.update(html); }, - + updateInactive: function(data) { var me = this; me.update(me.invalidHtml); diff --git a/www/manager6/dc/UserEdit.js b/www/manager6/dc/UserEdit.js index 584fe19f..3d3a71ab 100644 --- a/www/manager6/dc/UserEdit.js +++ b/www/manager6/dc/UserEdit.js @@ -31,9 +31,9 @@ Ext.define('PVE.dc.UserEdit', { return true; }; - verifypw = Ext.createWidget('textfield', { + verifypw = Ext.createWidget('textfield', { inputType: 'password', - fieldLabel: gettext('Confirm password'), + fieldLabel: gettext('Confirm password'), name: 'verifypassword', submitValue: false, disabled: true, @@ -41,9 +41,9 @@ Ext.define('PVE.dc.UserEdit', { validator: validate_pw }); - pwfield = Ext.createWidget('textfield', { + pwfield = Ext.createWidget('textfield', { inputType: 'password', - fieldLabel: gettext('Password'), + fieldLabel: gettext('Password'), minLength: 5, name: 'password', disabled: true, @@ -170,7 +170,7 @@ Ext.define('PVE.dc.UserEdit', { url: url, method: method, fieldDefaults: { - labelWidth: 110 // for spanish translation + labelWidth: 110 // for spanish translation }, items: [ ipanel ] }); diff --git a/www/manager6/dc/UserView.js b/www/manager6/dc/UserView.js index a2d050fb..655bb074 100644 --- a/www/manager6/dc/UserView.js +++ b/www/manager6/dc/UserView.js @@ -16,9 +16,9 @@ Ext.define('PVE.dc.UserView', { var store = new Ext.data.Store({ id: "users", model: 'pve-users', - sorters: { - property: 'userid', - order: 'DESC' + sorters: { + property: 'userid', + order: 'DESC' } }); @@ -41,7 +41,7 @@ Ext.define('PVE.dc.UserView', { reload(); } }); - + var run_editor = function() { var rec = sm.getSelection()[0]; if (!rec || !caps.access['User.Modify']) { @@ -161,7 +161,7 @@ Ext.define('PVE.dc.UserView', { header: gettext('Expire'), width: 80, sortable: true, - renderer: Proxmox.Utils.format_expire, + renderer: Proxmox.Utils.format_expire, dataIndex: 'expire' }, { diff --git a/www/manager6/form/BridgeSelector.js b/www/manager6/form/BridgeSelector.js index dc4a86d5..94bfa3af 100644 --- a/www/manager6/form/BridgeSelector.js +++ b/www/manager6/form/BridgeSelector.js @@ -61,7 +61,7 @@ Ext.define('PVE.form.BridgeSelector', { var me = this; var nodename = me.nodename; - me.nodename = undefined; + me.nodename = undefined; me.callParent(); diff --git a/www/manager6/form/BusTypeSelector.js b/www/manager6/form/BusTypeSelector.js index 04643e77..c886941f 100644 --- a/www/manager6/form/BusTypeSelector.js +++ b/www/manager6/form/BusTypeSelector.js @@ -1,7 +1,7 @@ Ext.define('PVE.form.BusTypeSelector', { extend: 'Proxmox.form.KVComboBox', alias: 'widget.pveBusSelector', - + noVirtIO: false, initComponent: function() { diff --git a/www/manager6/form/IPRefSelector.js b/www/manager6/form/IPRefSelector.js index 648a7750..d7662136 100644 --- a/www/manager6/form/IPRefSelector.js +++ b/www/manager6/form/IPRefSelector.js @@ -39,7 +39,7 @@ Ext.define('PVE.form.IPRefSelector', { }); var disable_query_for_ips = function(f, value) { - if (value === null || + if (value === null || value.match(/^\d/)) { // IP address starts with \d f.queryDelay = 9999999999; // hack: disable with long delay } else { @@ -66,7 +66,7 @@ Ext.define('PVE.form.IPRefSelector', { width: 140 }, { - header: gettext('Comment'), + header: gettext('Comment'), dataIndex: 'comment', renderer: Ext.String.htmlEncode, flex: 1 diff --git a/www/manager6/form/MemoryField.js b/www/manager6/form/MemoryField.js index 23ec9c5c..8d5dc030 100644 --- a/www/manager6/form/MemoryField.js +++ b/www/manager6/form/MemoryField.js @@ -24,7 +24,7 @@ Ext.define('PVE.form.MemoryField', { if (!me.hotplug) { return { up: value + me.step, down: value - me.step }; } - + var dimm_size = 512; var prev_dimm_size = 0; var min_size = 1024; @@ -41,7 +41,7 @@ Ext.define('PVE.form.MemoryField', { value_up = current_size + dimm_size; value_down = current_size - ((i === 0) ? prev_dimm_size : dimm_size); } - current_size += dimm_size; + current_size += dimm_size; } prev_dimm_size = dimm_size; dimm_size = dimm_size*2; diff --git a/www/manager6/form/SecurityGroupSelector.js b/www/manager6/form/SecurityGroupSelector.js index 4c7cd6f3..6867a7e6 100644 --- a/www/manager6/form/SecurityGroupSelector.js +++ b/www/manager6/form/SecurityGroupSelector.js @@ -32,7 +32,7 @@ Ext.define('PVE.form.SecurityGroupsSelector', { width: 100 }, { - header: gettext('Comment'), + header: gettext('Comment'), dataIndex: 'comment', renderer: Ext.String.htmlEncode, flex: 1 diff --git a/www/manager6/form/StorageSelector.js b/www/manager6/form/StorageSelector.js index db6678e1..8b1a8bd5 100644 --- a/www/manager6/form/StorageSelector.js +++ b/www/manager6/form/StorageSelector.js @@ -58,7 +58,7 @@ Ext.define('PVE.form.StorageSelector', { }); me.store.load(); - + }, setTargetNode: function(targetNode) { @@ -89,13 +89,13 @@ Ext.define('PVE.form.StorageSelector', { var me = this; var nodename = me.nodename; - me.nodename = undefined; + me.nodename = undefined; var store = Ext.create('Ext.data.Store', { model: 'pve-storage-status', sorters: { - property: 'storage', - order: 'DESC' + property: 'storage', + order: 'DESC' } }); diff --git a/www/manager6/form/VLanField.js b/www/manager6/form/VLanField.js index c6999070..4898b728 100644 --- a/www/manager6/form/VLanField.js +++ b/www/manager6/form/VLanField.js @@ -5,11 +5,11 @@ Ext.define('PVE.form.VlanField', { deleteEmpty: false, emptyText: 'no VLAN', - + fieldLabel: gettext('VLAN Tag'), allowBlank: true, - + getSubmitData: function() { var me = this, data = null, diff --git a/www/manager6/form/ViewSelector.js b/www/manager6/form/ViewSelector.js index 025fcfac..fd0b536d 100644 --- a/www/manager6/form/ViewSelector.js +++ b/www/manager6/form/ViewSelector.js @@ -33,12 +33,12 @@ Ext.define('PVE.form.ViewSelector', { return node.data.type === 'storage' || node.data.type === 'node'; } }, - pool: { - text: gettext('Pool View'), + pool: { + text: gettext('Pool View'), groups: ['pool'], // Pool View only lists VMs and Containers filterfn: function(node) { - return node.data.type === 'qemu' || node.data.type === 'lxc' || node.data.type === 'openvz' || + return node.data.type === 'qemu' || node.data.type === 'lxc' || node.data.type === 'openvz' || node.data.type === 'pool'; } } diff --git a/www/manager6/grid/BackupView.js b/www/manager6/grid/BackupView.js index 9312c59c..f1acba34 100644 --- a/www/manager6/grid/BackupView.js +++ b/www/manager6/grid/BackupView.js @@ -54,9 +54,9 @@ Ext.define('PVE.grid.BackupView', { me.store = Ext.create('Ext.data.Store', { model: 'pve-storage-content', - sorters: { - property: 'volid', - order: 'DESC' + sorters: { + property: 'volid', + order: 'DESC' }, filters: [ vmtypeFilter, @@ -147,7 +147,7 @@ Ext.define('PVE.grid.BackupView', { var backup_btn = Ext.create('Ext.button.Button', { text: gettext('Backup now'), handler: function() { - var win = Ext.create('PVE.window.Backup', { + var win = Ext.create('PVE.window.Backup', { nodename: nodename, vmid: vmid, vmtype: vmtype, diff --git a/www/manager6/grid/FirewallRules.js b/www/manager6/grid/FirewallRules.js index 42035129..57ff9eaf 100644 --- a/www/manager6/grid/FirewallRules.js +++ b/www/manager6/grid/FirewallRules.js @@ -66,7 +66,7 @@ Ext.define('PVE.FirewallRulePanel', { }); delete values.modified_marker; - + return values; }, @@ -80,7 +80,7 @@ Ext.define('PVE.FirewallRulePanel', { me.column1 = [ { // hack: we use this field to mark the form 'dirty' when the - // record has errors- so that the user can safe the unmodified + // record has errors- so that the user can safe the unmodified // form again. xtype: 'hiddenfield', name: 'modified_marker', @@ -148,7 +148,7 @@ Ext.define('PVE.FirewallRulePanel', { } ); - + me.column2 = [ { xtype: 'proxmoxcheckbox', @@ -430,7 +430,7 @@ Ext.define('PVE.FirewallRules', { moveRule: function(from, to) { var me = this; - if (!me.base_url) { + if (!me.base_url) { return; } @@ -451,7 +451,7 @@ Ext.define('PVE.FirewallRules', { updateRule: function(rule) { var me = this; - if (!me.base_url) { + if (!me.base_url) { return; } @@ -578,7 +578,7 @@ Ext.define('PVE.FirewallRules', { if (me.allow_groups) { me.groupBtn = Ext.create('Ext.Button', { - text: gettext('Insert') + ': ' + + text: gettext('Insert') + ': ' + gettext('Security Group'), disabled: true, handler: function() { @@ -618,7 +618,7 @@ Ext.define('PVE.FirewallRules', { if (errors && errors[name]) { metaData.tdCls = 'proxmox-invalid-row'; var html = '

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

'; - metaData.tdAttr = 'data-qwidth=600 data-qtitle="ERROR" data-qtip="' + + metaData.tdAttr = 'data-qwidth=600 data-qtitle="ERROR" data-qtip="' + html.replace(/\"/g,'"') + '"'; } return value; diff --git a/www/manager6/grid/ResourceGrid.js b/www/manager6/grid/ResourceGrid.js index e821a856..d7f1f6cb 100644 --- a/www/manager6/grid/ResourceGrid.js +++ b/www/manager6/grid/ResourceGrid.js @@ -41,7 +41,7 @@ Ext.define('PVE.grid.ResourceGrid', { var updateGrid = function() { var filterfn = me.viewFilter ? me.viewFilter.filterfn : null; - + //console.log("START GRID UPDATE " + me.viewFilter); store.suspendEvents(); @@ -91,8 +91,8 @@ Ext.define('PVE.grid.ResourceGrid', { for (key in nodeidx) { if (nodeidx.hasOwnProperty(key)) { var item = nodeidx[key]; - - // getById() use find(), which is slow (ExtJS4 DP5) + + // getById() use find(), which is slow (ExtJS4 DP5) //var olditem = store.getById(item.data.id); var olditem = store.data.get(item.data.id); @@ -119,7 +119,7 @@ Ext.define('PVE.grid.ResourceGrid', { } if (changes) { olditem.endEdit(true); - olditem.commit(true); + olditem.commit(true); } } } @@ -141,8 +141,8 @@ Ext.define('PVE.grid.ResourceGrid', { updateGrid(); }); - var load_cb = function() { - updateGrid(); + var load_cb = function() { + updateGrid(); }; Ext.apply(me, { @@ -150,7 +150,7 @@ Ext.define('PVE.grid.ResourceGrid', { stateful: true, stateId: 'grid-resource', tbar: [ - '->', + '->', gettext('Search') + ':', ' ', { xtype: 'textfield', diff --git a/www/manager6/ha/Fencing.js b/www/manager6/ha/Fencing.js index 164e7feb..a9a7a690 100644 --- a/www/manager6/ha/Fencing.js +++ b/www/manager6/ha/Fencing.js @@ -41,7 +41,7 @@ Ext.define('PVE.ha.FencingView', { Ext.define('pve-ha-fencing', { extend: 'Ext.data.Model', - fields: [ + fields: [ 'node', 'command', 'digest' ] }); diff --git a/www/manager6/ha/GroupEdit.js b/www/manager6/ha/GroupEdit.js index 3a879f8d..c132b1d6 100644 --- a/www/manager6/ha/GroupEdit.js +++ b/www/manager6/ha/GroupEdit.js @@ -185,7 +185,7 @@ Ext.define('PVE.ha.GroupInputPanel', { }, nodegrid ]; - + me.callParent(); } }); @@ -197,7 +197,7 @@ Ext.define('PVE.ha.GroupEdit', { initComponent : function() { var me = this; - + me.isCreate = !me.groupId; if (me.isCreate) { @@ -217,7 +217,7 @@ Ext.define('PVE.ha.GroupEdit', { subject: gettext('HA Group'), items: [ ipanel ] }); - + me.callParent(); if (!me.isCreate) { diff --git a/www/manager6/ha/GroupSelector.js b/www/manager6/ha/GroupSelector.js index f7a12772..46017da5 100644 --- a/www/manager6/ha/GroupSelector.js +++ b/www/manager6/ha/GroupSelector.js @@ -30,9 +30,9 @@ Ext.define('PVE.ha.GroupSelector', { }, store: { model: 'pve-ha-groups', - sorters: { - property: 'group', - order: 'DESC' + sorters: { + property: 'group', + order: 'DESC' } }, @@ -46,7 +46,7 @@ Ext.define('PVE.ha.GroupSelector', { Ext.define('pve-ha-groups', { extend: 'Ext.data.Model', - fields: [ + fields: [ 'group', 'type', 'digest', 'nodes', 'comment', { name : 'restricted', diff --git a/www/manager6/ha/Groups.js b/www/manager6/ha/Groups.js index 1e6fcd74..9d92f4df 100644 --- a/www/manager6/ha/Groups.js +++ b/www/manager6/ha/Groups.js @@ -14,12 +14,12 @@ Ext.define('PVE.ha.GroupsView', { var store = new Ext.data.Store({ model: 'pve-ha-groups', - sorters: { - property: 'group', - order: 'DESC' + sorters: { + property: 'group', + order: 'DESC' } }); - + var reload = function() { store.load(); }; @@ -43,7 +43,7 @@ Ext.define('PVE.ha.GroupsView', { reload(); } }); - + var edit_btn = new Proxmox.button.Button({ text: gettext('Edit'), disabled: true, diff --git a/www/manager6/ha/ResourceEdit.js b/www/manager6/ha/ResourceEdit.js index c9d9875f..39310ead 100644 --- a/www/manager6/ha/ResourceEdit.js +++ b/www/manager6/ha/ResourceEdit.js @@ -2,7 +2,7 @@ Ext.define('PVE.ha.VMResourceInputPanel', { extend: 'Proxmox.panel.InputPanel', onlineHelp: 'ha_manager_resource_config', vmid: undefined, - + onGetValues: function(values) { var me = this; @@ -146,7 +146,7 @@ Ext.define('PVE.ha.VMResourceInputPanel', { }, fewVotesHint ]; - + me.callParent(); } }); @@ -160,7 +160,7 @@ Ext.define('PVE.ha.VMResourceEdit', { initComponent : function() { var me = this; - + if (me.isCreate === undefined) { me.isCreate = !me.vmid; } @@ -185,7 +185,7 @@ Ext.define('PVE.ha.VMResourceEdit', { isAdd: true, items: [ ipanel ] }); - + me.callParent(); if (!me.isCreate) { @@ -201,7 +201,7 @@ Ext.define('PVE.ha.VMResourceEdit', { } values.vmid = res[2]; - + ipanel.setValues(values); } }); diff --git a/www/manager6/ha/Resources.js b/www/manager6/ha/Resources.js index 249036ca..f0ae7fd3 100644 --- a/www/manager6/ha/Resources.js +++ b/www/manager6/ha/Resources.js @@ -37,7 +37,7 @@ Ext.define('PVE.ha.ResourcesView', { if (msg) { metaData.tdCls = 'proxmox-invalid-row'; var html = '

' + Ext.htmlEncode(msg) + '

'; - metaData.tdAttr = 'data-qwidth=600 data-qtitle="ERROR" data-qtip="' + + metaData.tdAttr = 'data-qwidth=600 data-qtitle="ERROR" data-qtip="' + html.replace(/\"/g,'"') + '"'; } } @@ -49,7 +49,7 @@ Ext.define('PVE.ha.ResourcesView', { var run_editor = function() { var rec = sm.getSelection()[0]; var sid = rec.data.sid; - + var regex = /^(\S+):(\S+)$/; var res = regex.exec(sid); @@ -58,7 +58,7 @@ Ext.define('PVE.ha.ResourcesView', { } var guestType = res[1]; var vmid = res[2]; - + var win = Ext.create('PVE.ha.VMResourceEdit',{ guestType: guestType, vmid: vmid @@ -78,7 +78,7 @@ Ext.define('PVE.ha.ResourcesView', { reload(); } }); - + var edit_btn = new Proxmox.button.Button({ text: gettext('Edit'), disabled: true, diff --git a/www/manager6/ha/StatusView.js b/www/manager6/ha/StatusView.js index 2e8fc559..09f8fa54 100644 --- a/www/manager6/ha/StatusView.js +++ b/www/manager6/ha/StatusView.js @@ -10,7 +10,7 @@ Ext.define('PVE.ha.StatusView', { lrm: 3, service: 4 }, - + initComponent : function() { var me = this; @@ -61,14 +61,14 @@ Ext.define('PVE.ha.StatusView', { me.callParent(); me.on('activate', me.rstore.startUpdate); - me.on('destroy', me.rstore.stopUpdate); + me.on('destroy', me.rstore.stopUpdate); } }, function() { Ext.define('pve-ha-status', { extend: 'Ext.data.Model', - fields: [ + fields: [ 'id', 'type', 'node', 'status', 'sid', 'state', 'group', 'comment', 'max_restart', 'max_relocate', 'type', diff --git a/www/manager6/lxc/Network.js b/www/manager6/lxc/Network.js index 8af00fca..7bb6ad72 100644 --- a/www/manager6/lxc/Network.js +++ b/www/manager6/lxc/Network.js @@ -167,7 +167,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', { cdata.ip6 = ''; cdata.gw6 = ''; } - + me.column2 = [ { layout: { diff --git a/www/manager6/lxc/Options.js b/www/manager6/lxc/Options.js index 40bde35f..42a76f3e 100644 --- a/www/manager6/lxc/Options.js +++ b/www/manager6/lxc/Options.js @@ -41,7 +41,7 @@ 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' diff --git a/www/manager6/lxc/ResourceEdit.js b/www/manager6/lxc/ResourceEdit.js index dbc75f99..0c4dbce7 100644 --- a/www/manager6/lxc/ResourceEdit.js +++ b/www/manager6/lxc/ResourceEdit.js @@ -140,7 +140,7 @@ Ext.define('PVE.lxc.MemoryInputPanel', { } else { me.items = items; } - + me.callParent(); } }); diff --git a/www/manager6/lxc/Resources.js b/www/manager6/lxc/Resources.js index 73178f85..ed82e418 100644 --- a/www/manager6/lxc/Resources.js +++ b/www/manager6/lxc/Resources.js @@ -20,7 +20,7 @@ Ext.define('PVE.lxc.RessourceView', { var i, confid; var nodename = me.pveSelNode.data.node; - if (!nodename) { + if (!nodename) { throw "no node name specified"; } @@ -249,7 +249,7 @@ Ext.define('PVE.lxc.RessourceView', { revert_btn.setDisabled(!pending); }; - + var sorterFn = function(rec1, rec2) { var v1 = rec1.data.key; var v2 = rec2.data.key; diff --git a/www/manager6/panel/IPSet.js b/www/manager6/panel/IPSet.js index f8f8c1c6..9645fa76 100644 --- a/www/manager6/panel/IPSet.js +++ b/www/manager6/panel/IPSet.js @@ -348,7 +348,7 @@ Ext.define('PVE.IPSetGrid', { if (msg) { metaData.tdCls = 'proxmox-invalid-row'; var html = '

' + Ext.htmlEncode(msg) + '

'; - metaData.tdAttr = 'data-qwidth=600 data-qtitle="ERROR" data-qtip="' + + metaData.tdAttr = 'data-qwidth=600 data-qtitle="ERROR" data-qtip="' + html.replace(/\"/g,'"') + '"'; } } diff --git a/www/manager6/panel/StatusPanel.js b/www/manager6/panel/StatusPanel.js index 92d4d99e..15c0cec5 100644 --- a/www/manager6/panel/StatusPanel.js +++ b/www/manager6/panel/StatusPanel.js @@ -5,7 +5,7 @@ Ext.define('PVE.panel.StatusPanel', { extend: 'Ext.tab.Panel', alias: 'widget.pveStatusPanel', - + //title: "Logs", //tabPosition: 'bottom', @@ -58,7 +58,7 @@ Ext.define('PVE.panel.StatusPanel', { sp.on('statechange', statechange); me.on('destroy', function() { - sp.un('statechange', statechange); + sp.un('statechange', statechange); }); } diff --git a/www/manager6/pool/StatusView.js b/www/manager6/pool/StatusView.js index 8628964b..faaf8d88 100644 --- a/www/manager6/pool/StatusView.js +++ b/www/manager6/pool/StatusView.js @@ -17,7 +17,7 @@ Ext.define('PVE.pool.StatusView', { var rows = { comment: { - header: gettext('Comment'), + header: gettext('Comment'), renderer: Ext.String.htmlEncode, required: true } diff --git a/www/manager6/pool/Summary.js b/www/manager6/pool/Summary.js index 47c0c7ac..4a6fb843 100644 --- a/www/manager6/pool/Summary.js +++ b/www/manager6/pool/Summary.js @@ -28,7 +28,7 @@ Ext.define('PVE.pool.Summary', { }); me.on('activate', rstore.startUpdate); - me.on('destroy', rstore.stopUpdate); + me.on('destroy', rstore.stopUpdate); me.callParent(); } diff --git a/www/manager6/qemu/CDEdit.js b/www/manager6/qemu/CDEdit.js index 720ddde2..00134c21 100644 --- a/www/manager6/qemu/CDEdit.js +++ b/www/manager6/qemu/CDEdit.js @@ -8,7 +8,7 @@ Ext.define('PVE.qemu.CDInputPanel', { var me = this; var confid = me.confid || (values.controller + values.deviceid); - + me.drive.media = 'cdrom'; if (values.mediaType === 'iso') { me.drive.file = values.cdimage; @@ -19,10 +19,10 @@ Ext.define('PVE.qemu.CDInputPanel', { } var params = {}; - + params[confid] = PVE.Parser.printQemuDrive(me.drive); - - return params; + + return params; }, setVMConfig: function(vmconfig) { @@ -107,7 +107,7 @@ Ext.define('PVE.qemu.CDInputPanel', { labelAlign: 'right', allowBlank: false }); - + me.cdstoragesel = Ext.create('PVE.form.StorageSelector', { name: 'cdstorage', nodename: me.nodename, @@ -172,7 +172,7 @@ Ext.define('PVE.qemu.CDEdit', { }); me.callParent(); - + me.load({ success: function(response, options) { ipanel.setVMConfig(response.result.data); diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js index 40b3fe86..b641317d 100644 --- a/www/manager6/qemu/HardwareView.js +++ b/www/manager6/qemu/HardwareView.js @@ -48,7 +48,7 @@ Ext.define('PVE.qemu.HardwareView', { var i, confid; var nodename = me.pveSelNode.data.node; - if (!nodename) { + if (!nodename) { throw "no node name specified"; } @@ -93,7 +93,7 @@ Ext.define('PVE.qemu.HardwareView', { sockets: { header: gettext('Processors'), never_delete: true, - editor: (caps.vms['VM.Config.CPU'] || caps.vms['VM.Config.HWType']) ? + editor: (caps.vms['VM.Config.CPU'] || caps.vms['VM.Config.HWType']) ? 'PVE.qemu.ProcessorEdit' : undefined, tdCls: 'pve-itype-icon-processor', group: 3, @@ -151,7 +151,7 @@ Ext.define('PVE.qemu.HardwareView', { iconCls: 'desktop', group:5, defaultValue: '', - renderer: PVE.Utils.render_kvm_vga_driver + renderer: PVE.Utils.render_kvm_vga_driver }, machine: { header: gettext('Machine'), @@ -318,7 +318,7 @@ Ext.define('PVE.qemu.HardwareView', { if ((g1 - g2) !== 0) { return g1 - g2; } - + if ((order1 - order2) !== 0) { return order1 - order2; } @@ -612,7 +612,7 @@ Ext.define('PVE.qemu.HardwareView', { interval: 5000, selModel: sm, run_editor: run_editor, - tbar: [ + tbar: [ { text: gettext('Add'), menu: new Ext.menu.Menu({ diff --git a/www/manager6/qemu/MemoryEdit.js b/www/manager6/qemu/MemoryEdit.js index 445308ed..fbe995a3 100644 --- a/www/manager6/qemu/MemoryEdit.js +++ b/www/manager6/qemu/MemoryEdit.js @@ -142,7 +142,7 @@ Ext.define('PVE.qemu.MemoryEdit', { subject: gettext('Memory'), items: [ ipanel ], // uncomment the following to use the async configiguration API - // backgroundDelay: 5, + // backgroundDelay: 5, width: 400 }); diff --git a/www/manager6/qemu/Monitor.js b/www/manager6/qemu/Monitor.js index 4cfd1537..900aee58 100644 --- a/www/manager6/qemu/Monitor.js +++ b/www/manager6/qemu/Monitor.js @@ -73,7 +73,7 @@ Ext.define('PVE.qemu.Monitor', { method: 'POST', waitMsgTarget: me, success: function(response, opts) { - var res = response.result.data; + var res = response.result.data; Ext.Array.each(res.split('\n'), function(line) { addLine(Ext.htmlEncode(line)); }); @@ -144,7 +144,7 @@ Ext.define('PVE.qemu.Monitor', { field.focus(false, true); } } - }); + }); me.callParent(); } diff --git a/www/manager6/qemu/NetworkEdit.js b/www/manager6/qemu/NetworkEdit.js index f8b448ce..49e49dc9 100644 --- a/www/manager6/qemu/NetworkEdit.js +++ b/www/manager6/qemu/NetworkEdit.js @@ -45,7 +45,7 @@ Ext.define('PVE.qemu.NetworkInputPanel', { data.networkmode = 'bridge'; } me.network = data; - + me.setValues(me.network); }, @@ -177,8 +177,8 @@ Ext.define('PVE.qemu.NetworkEdit', { var me = this; var nodename = me.pveSelNode.data.node; - if (!nodename) { - throw "no node name specified"; + if (!nodename) { + throw "no node name specified"; } me.isCreate = me.confid ? false : true; diff --git a/www/manager6/qemu/Smbios1Edit.js b/www/manager6/qemu/Smbios1Edit.js index cb005a71..c43689dc 100644 --- a/www/manager6/qemu/Smbios1Edit.js +++ b/www/manager6/qemu/Smbios1Edit.js @@ -20,7 +20,7 @@ Ext.define('PVE.qemu.Smbios1InputPanel', { var me = this; me.smbios1 = data; - + me.setValues(me.smbios1); }, diff --git a/www/manager6/sdn/StatusView.js b/www/manager6/sdn/StatusView.js index 86340579..6bc83bff 100644 --- a/www/manager6/sdn/StatusView.js +++ b/www/manager6/sdn/StatusView.js @@ -78,7 +78,7 @@ Ext.define('PVE.sdn.StatusView', { me.callParent(); me.on('activate', me.rstore.startUpdate); - me.on('destroy', me.rstore.stopUpdate); + me.on('destroy', me.rstore.stopUpdate); } }, function() { diff --git a/www/manager6/storage/LVMEdit.js b/www/manager6/storage/LVMEdit.js index d2124a89..4048f8bd 100644 --- a/www/manager6/storage/LVMEdit.js +++ b/www/manager6/storage/LVMEdit.js @@ -153,7 +153,7 @@ Ext.define('PVE.storage.LVMInputPanel', { me.column1.push(vgnameField); - // here value is an array, + // here value is an array, // while before it was a string me.column1.push({ xtype: 'pveContentTypeSelector', diff --git a/www/manager6/tree/ResourceTree.js b/www/manager6/tree/ResourceTree.js index 96865f16..317d17df 100644 --- a/www/manager6/tree/ResourceTree.js +++ b/www/manager6/tree/ResourceTree.js @@ -7,11 +7,11 @@ Ext.define('PVE.tree.ResourceTree', { statics: { typeDefaults: { - node: { + node: { iconCls: 'fa fa-building', text: gettext('Nodes') }, - pool: { + pool: { iconCls: 'fa fa-tags', text: gettext('Resource Pool') }, @@ -205,7 +205,7 @@ Ext.define('PVE.tree.ResourceTree', { } } groupinfo.leaf = false; - groupinfo.groupbyid = v; + groupinfo.groupbyid = v; group = me.addChildSorted(node, groupinfo); } if (info.type === groupby) { @@ -275,7 +275,7 @@ Ext.define('PVE.tree.ResourceTree', { if (index.hasOwnProperty(key)) { var olditem = index[key]; - // getById() use find(), which is slow (ExtJS4 DP5) + // getById() use find(), which is slow (ExtJS4 DP5) //var item = rstore.getById(olditem.data.id); var item = rstore.data.get(olditem.data.id); @@ -497,7 +497,7 @@ Ext.define('PVE.tree.ResourceTree', { me.callParent(); var sm = me.getSelectionModel(); - sm.on('select', function(sm, n) { + sm.on('select', function(sm, n) { sp.set(stateid, { value: n.data.id}); }); diff --git a/www/manager6/window/Backup.js b/www/manager6/window/Backup.js index f50e4f30..40c3c157 100644 --- a/www/manager6/window/Backup.js +++ b/www/manager6/window/Backup.js @@ -106,7 +106,7 @@ Ext.define('PVE.window.Backup', { me.hide(); var upid = response.result.data; - + var win = Ext.create('Proxmox.window.TaskViewer', { upid: upid, listeners: { @@ -127,7 +127,7 @@ Ext.define('PVE.window.Backup', { hidden: false }); - var title = gettext('Backup') + " " + + var title = gettext('Backup') + " " + ((me.vmtype === 'lxc') ? "CT" : "VM") + " " + me.vmid; diff --git a/www/manager6/window/Restore.js b/www/manager6/window/Restore.js index f720eb3b..51f6a853 100644 --- a/www/manager6/window/Restore.js +++ b/www/manager6/window/Restore.js @@ -124,7 +124,7 @@ Ext.define('PVE.window.Restore', { }, success: function(response, options) { var upid = response.result.data; - + var win = Ext.create('Proxmox.window.TaskViewer', { upid: upid }); diff --git a/www/manager6/window/StartupEdit.js b/www/manager6/window/StartupEdit.js index 82bf8d39..4be3dbb8 100644 --- a/www/manager6/window/StartupEdit.js +++ b/www/manager6/window/StartupEdit.js @@ -79,7 +79,7 @@ Ext.define('PVE.window.StartupEdit', { success: function(response, options) { var i, confid; me.vmconfig = response.result.data; - ipanel.setStartup(me.vmconfig.startup); + ipanel.setStartup(me.vmconfig.startup); } }); } diff --git a/www/manager6/window/Wizard.js b/www/manager6/window/Wizard.js index 87e4bf0a..88a6626b 100644 --- a/www/manager6/window/Wizard.js +++ b/www/manager6/window/Wizard.js @@ -40,8 +40,8 @@ Ext.define('PVE.window.Wizard', { var tabs = me.items || []; delete me.items; - - /* + + /* * Items may have the following functions: * validator(): per tab custom validation * onSubmit(): submit handler @@ -90,14 +90,14 @@ Ext.define('PVE.window.Wizard', { var tabchange = function(tp, newcard, oldcard) { if (newcard.onSubmit) { me.down('#next').setVisible(false); - me.down('#submit').setVisible(true); + me.down('#submit').setVisible(true); } else { me.down('#next').setVisible(true); - me.down('#submit').setVisible(false); + me.down('#submit').setVisible(false); } var valid = check_card(newcard); - me.down('#next').setDisabled(!valid); - me.down('#submit').setDisabled(!valid); + me.down('#next').setDisabled(!valid); + me.down('#submit').setDisabled(!valid); me.down('#back').setDisabled(tp.items.indexOf(newcard) == 0); var idx = tp.items.indexOf(newcard); -- 2.39.2