jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Force clipping mode in Safari on all platforms

This commit is contained in:
samhed 2016-04-25 16:38:23 +02:00
parent 529c64e103
commit f620259bc5
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/ui.js
View File

@ -35,6 +35,7 @@ var UI;
keyboardVisible: false, keyboardVisible: false,
isTouchDevice: false, isTouchDevice: false,
isSafari: false,
rememberedClipSetting: null, rememberedClipSetting: null,
lastKeyboardinput: null, lastKeyboardinput: null,
defaultKeyboardinputLen: 100, defaultKeyboardinputLen: 100,
@ -137,12 +138,12 @@ var UI;
UI.setBarPosition(); UI.setBarPosition();
} ); } );
var isSafari = (navigator.userAgent.indexOf('Safari') != -1 && UI.isSafari = (navigator.userAgent.indexOf('Safari') != -1 &&
navigator.userAgent.indexOf('Chrome') == -1); navigator.userAgent.indexOf('Chrome') == -1);
// Only show the button if fullscreen is properly supported // Only show the button if fullscreen is properly supported
// * Safari doesn't support alphanumerical input while in fullscreen // * Safari doesn't support alphanumerical input while in fullscreen
if (!isSafari && if (!UI.isSafari &&
(document.documentElement.requestFullscreen || (document.documentElement.requestFullscreen ||
document.documentElement.mozRequestFullScreen || document.documentElement.mozRequestFullScreen ||
document.documentElement.webkitRequestFullscreen || document.documentElement.webkitRequestFullscreen ||
@ -942,7 +943,12 @@ var UI;
var resizeElem = $D('noVNC_resize'); var resizeElem = $D('noVNC_resize');
var connected = UI.rfb && UI.rfb_state === 'normal'; var connected = UI.rfb && UI.rfb_state === 'normal';
if (resizeElem.value === 'downscale' || resizeElem.value === 'scale') { if (UI.isSafari) {
// Safari auto-hides the scrollbars which makes them
// impossible to use in most cases
UI.setViewClip(true);
$D('noVNC_clip').disabled = true;
} else if (resizeElem.value === 'downscale' || resizeElem.value === 'scale') {
// Disable clipping if we are scaling // Disable clipping if we are scaling
UI.setViewClip(false); UI.setViewClip(false);
$D('noVNC_clip').disabled = true; $D('noVNC_clip').disabled = true;