X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=vnc_lite.html;h=4a96d448fc4a58f042f94b2b2f43ef6da49c9aea;hb=8ad8f15cf6ea3a5417ee471d168a585f11f225bc;hp=762da01381b974e248353e5c909ab86ddb31ee15;hpb=d472f3f19ef8cb9000ccfdf854d9f40e587fac0a;p=mirror_novnc.git
diff --git a/vnc_lite.html b/vnc_lite.html
index 762da01..4a96d44 100644
--- a/vnc_lite.html
+++ b/vnc_lite.html
@@ -36,7 +36,9 @@
+
@@ -80,24 +82,8 @@
import RFB from './core/rfb.js';
var rfb;
- var doneInitialResize;
- var resizeTimeout;
var desktopName;
- function UIresize() {
- if (WebUtil.getConfigVar('resize', false)) {
- var innerW = window.innerWidth;
- var innerH = window.innerHeight;
- var controlbarH = document.getElementById('noVNC_status_bar').offsetHeight;
- if (innerW !== undefined && innerH !== undefined)
- rfb.requestDesktopSize(innerW, innerH - controlbarH);
- }
- }
- function initialResize() {
- if (doneInitialResize) return;
- UIresize();
- doneInitialResize = true;
- }
function updateDesktopName(e) {
desktopName = e.detail.name;
}
@@ -150,7 +136,6 @@
function connected(e) {
document.getElementById('sendCtrlAltDelButton').disabled = false;
- doneInitialResize = false;
if (WebUtil.getConfigVar('encrypt',
(window.location.protocol === "https:"))) {
status("Connected (encrypted) to " + desktopName, "normal");
@@ -169,23 +154,13 @@
}
}
- window.onresize = function () {
- // When the window has been resized, wait until the size remains
- // the same for 0.5 seconds before sending the request for changing
- // the resolution of the session
- clearTimeout(resizeTimeout);
- resizeTimeout = setTimeout(function(){
- UIresize();
- }, 500);
- };
-
function updatePowerButtons() {
var powerbuttons;
powerbuttons = document.getElementById('noVNC_power_buttons');
if (rfb.capabilities.power) {
- xvpbuttons.className= "noVNC_shown";
+ powerbuttons.className= "noVNC_shown";
} else {
- xvpbuttons.className = "noVNC_hidden";
+ powerbuttons.className = "noVNC_hidden";
}
}
@@ -247,16 +222,18 @@
}
url += '/' + path;
- rfb = new RFB(document.getElementById('noVNC_canvas'), url,
+ rfb = new RFB(document.body, url,
{ repeaterID: WebUtil.getConfigVar('repeaterID', ''),
shared: WebUtil.getConfigVar('shared', true),
credentials: { password: password } });
rfb.viewOnly = WebUtil.getConfigVar('view_only', false);
rfb.addEventListener("connect", connected);
rfb.addEventListener("disconnect", disconnected);
- rfb.addEventListener("capabilities", function () { updatePowerButtons(); initialResize(); });
+ rfb.addEventListener("capabilities", function () { updatePowerButtons(); });
rfb.addEventListener("credentialsrequired", credentials);
rfb.addEventListener("desktopname", updateDesktopName);
+ rfb.scaleViewport = WebUtil.getConfigVar('scale', false);
+ rfb.resizeSession = WebUtil.getConfigVar('resize', false);
})();
@@ -278,9 +255,5 @@
-
-