From 635cc133e044b809c36795528e7b6ae631d3d23e Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 4 Sep 2019 13:46:55 +0200 Subject: [PATCH] vnc scaling: still fallback to old default value if not set as else we change behavior for those who never set the new scaling variable, or cleared the browser local store. Signed-off-by: Thomas Lamprecht --- www/manager6/Utils.js | 2 +- www/manager6/VNCConsole.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 36732a37..6a489e7e 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -967,7 +967,7 @@ Ext.define('PVE.Utils', { utilities: { vmid: vmid, vmname: vmname, node: nodename, - resize: sp.get('novnc-scaling'), + resize: sp.get('novnc-scaling', 'off'), cmd: cmd }); var nw = window.open("?" + url, '_blank', "innerWidth=745,innerheight=427"); diff --git a/www/manager6/VNCConsole.js b/www/manager6/VNCConsole.js index 22c82257..33b82846 100644 --- a/www/manager6/VNCConsole.js +++ b/www/manager6/VNCConsole.js @@ -47,7 +47,7 @@ Ext.define('PVE.noVncConsole', { vmid: me.vmid, node: me.nodename, cmd: me.cmd, - resize: sp.get('novnc-scaling'), + resize: sp.get('novnc-scaling', 'scale'), }; queryDict[type] = 1; PVE.Utils.cleanEmptyObjectKeys(queryDict); -- 2.39.2