From 9fb537753aade16cc3fe7d80dfdf7da4c31671b7 Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Wed, 16 Mar 2016 15:58:15 +0100 Subject: [PATCH] ext6migrate: remove trailing whitespaces Signed-off-by: Dominik Csapak --- www/manager6/button/ConsoleButton.js | 6 +++--- www/manager6/panel/Firewall.js | 12 ++++++------ www/manager6/panel/SubConfigPanel.js | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/www/manager6/button/ConsoleButton.js b/www/manager6/button/ConsoleButton.js index c4ce3454..98ebea0e 100644 --- a/www/manager6/button/ConsoleButton.js +++ b/www/manager6/button/ConsoleButton.js @@ -29,7 +29,7 @@ Ext.define('PVE.button.ConsoleButton', { me.spiceMenu = Ext.create('Ext.menu.Item', { text: 'SPICE', iconCls: 'pve-itype-icon-virt-viewer', - handler: function() { + handler: function() { PVE.Utils.openConsoleWindow('vv', me.consoleType, me.vmid, me.nodename, me.consoleName); } }); @@ -37,7 +37,7 @@ Ext.define('PVE.button.ConsoleButton', { var noVncMenu = Ext.create('Ext.menu.Item', { text: 'noVNC', iconCls: 'pve-itype-icon-novnc', - handler: function() { + handler: function() { PVE.Utils.openConsoleWindow('html5', me.consoleType, me.vmid, me.nodename, me.consoleName); } }); @@ -48,7 +48,7 @@ Ext.define('PVE.button.ConsoleButton', { Ext.apply(me, { handler: function() { - PVE.Utils.openDefaultConsoleWindow(me.enableSpice, me.consoleType, me.vmid, + PVE.Utils.openDefaultConsoleWindow(me.enableSpice, me.consoleType, me.vmid, me.nodename, me.consoleName); }, menu: new Ext.menu.Menu({ diff --git a/www/manager6/panel/Firewall.js b/www/manager6/panel/Firewall.js index f11fdb97..2d8c7fbe 100644 --- a/www/manager6/panel/Firewall.js +++ b/www/manager6/panel/Firewall.js @@ -20,7 +20,7 @@ Ext.define('PVE.panel.Firewall', { throw "unknown firewall panel type"; } - var list_refs_url = me.fwtype === 'vm' ? (me.base_url + '/refs') : + var list_refs_url = me.fwtype === 'vm' ? (me.base_url + '/refs') : '/cluster/firewall/refs'; var items = [ @@ -42,13 +42,13 @@ Ext.define('PVE.panel.Firewall', { }); items.push({ xtype: 'pveFirewallAliases', - base_url: '/cluster/firewall/aliases', + base_url: '/cluster/firewall/aliases', itemId: 'aliases' }); items.push({ xtype: 'pveIPSet', base_url: '/cluster/firewall/ipset', - list_refs_url: list_refs_url, + list_refs_url: list_refs_url, itemId: 'ipset' }); } @@ -56,13 +56,13 @@ Ext.define('PVE.panel.Firewall', { if (me.fwtype === 'vm') { items.push({ xtype: 'pveFirewallAliases', - base_url: me.base_url + '/aliases', + base_url: me.base_url + '/aliases', itemId: 'aliases' }); items.push({ xtype: 'pveIPSet', - base_url: me.base_url + '/ipset', - list_refs_url: list_refs_url, + base_url: me.base_url + '/ipset', + list_refs_url: list_refs_url, itemId: 'ipset' }); } diff --git a/www/manager6/panel/SubConfigPanel.js b/www/manager6/panel/SubConfigPanel.js index 5aa83bdd..4c3b871a 100644 --- a/www/manager6/panel/SubConfigPanel.js +++ b/www/manager6/panel/SubConfigPanel.js @@ -10,7 +10,7 @@ Ext.define('PVE.panel.SubConfig', { getHState: function(itemId) { /*jslint confusion: true */ var me = this; - + if (!itemId) { if (me.getActiveTab() === undefined) { me.setActiveTab(0); @@ -40,7 +40,7 @@ Ext.define('PVE.panel.SubConfig', { var sp = Ext.state.Manager.getProvider(); var state = sp.get(me.phstateid); - + var hsregex = /^([^\-\s]+)-(\S+)?$/; if (state && state.value) { @@ -54,7 +54,7 @@ Ext.define('PVE.panel.SubConfig', { Ext.apply(me, { listeners: { afterrender: function(tp) { - // if we have lazy items, + // if we have lazy items, // we saved the tabname in savedTab if (me.activeTab === undefined && me.savedTab) { me.setActiveTab(me.savedTab);