Allow scroll bars on Safari and IE

The previous problems were because we were scrolling the wrong element,
so we can enable this feature now.
This commit is contained in:
Samuel Mannehed 2017-02-16 15:14:08 +01:00
parent f3b7727535
commit b18ef8162e

View File

@ -1315,34 +1315,11 @@ var UI;
enableDisableViewClip: function() { enableDisableViewClip: function() {
var resizeSetting = UI.getSetting('resize'); var resizeSetting = UI.getSetting('resize');
if (UI.isSafari) { if (resizeSetting === 'downscale' || resizeSetting === 'scale') {
// Safari auto-hides the scrollbars which makes them
// impossible to use in most cases
UI.setViewClip(true);
document.getElementById('noVNC_setting_clip').disabled = true;
} else if (resizeSetting === 'downscale' || resizeSetting === 'scale') {
// Disable clipping if we are scaling // Disable clipping if we are scaling
UI.forceSetting('clip', false); UI.forceSetting('clip', false);
UI.setViewClip(false); UI.setViewClip(false);
document.getElementById('noVNC_setting_clip').disabled = true; document.getElementById('noVNC_setting_clip').disabled = true;
} else if (document.msFullscreenElement) {
// The browser is IE and we are in fullscreen mode.
// - We need to force clipping while in fullscreen since
// scrollbars doesn't work.
var msg = _("Forcing clipping mode since " +
"scrollbars aren't supported " +
"by IE in fullscreen");
Util.Debug(msg);
UI.showStatus(msg);
UI.rememberedClipSetting = UI.getSetting('clip');
UI.setViewClip(true);
document.getElementById('noVNC_setting_clip').disabled = true;
} else if (document.body.msRequestFullscreen &&
UI.rememberedClipSetting !== null) {
// Restore view clip to what it was before fullscreen on IE
UI.setViewClip(UI.rememberedClipSetting);
document.getElementById('noVNC_setting_clip').disabled =
UI.connected || Util.isTouchDevice;
} else { } else {
document.getElementById('noVNC_setting_clip').disabled = document.getElementById('noVNC_setting_clip').disabled =
UI.connected || Util.isTouchDevice; UI.connected || Util.isTouchDevice;