]> git.proxmox.com Git - pve-manager.git/commitdiff
vnc scaling: still fallback to old default value if not set
authorThomas Lamprecht <t.lamprecht@proxmox.com>
Wed, 4 Sep 2019 11:46:55 +0000 (13:46 +0200)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Wed, 4 Sep 2019 11:46:57 +0000 (13:46 +0200)
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 <t.lamprecht@proxmox.com>
www/manager6/Utils.js
www/manager6/VNCConsole.js

index 36732a37215787333ca51c990ad139629180ebdb..6a489e7ecd4bd9a98a86967316a5e50432e7f067 100644 (file)
@@ -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");
index 22c82257f43d45dd4a88b5e70c1498845ccb4e4c..33b8284692fb5fe7cdc92ccffe77b46858b4b1be 100644 (file)
@@ -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);