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

Avoid ambigious optional arguments 

Some functions weren't obvious what they would do if an argument was
omitted. Split them up in to separate functions in those cases to
make the API clearer.
This commit is contained in:
samhed 2016-08-24 18:03:32 +02:00 committed by Pierre Ossman
parent 3e3eec28f3
commit f0d9ab9698
1 changed files with 98 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
app/ui.js
View File

@ -76,7 +76,7 @@ var UI;
if (UI.isTouchDevice) { if (UI.isTouchDevice) {
// Show mobile buttons // Show mobile buttons
document.getElementById('noVNC_mobile_buttons').style.display = "inline"; document.getElementById('noVNC_mobile_buttons').style.display = "inline";
UI.setMouseButton(); UI.hideMouseButton();
// Remove the address bar // Remove the address bar
setTimeout(function() { window.scrollTo(0, 1); }, 100); setTimeout(function() { window.scrollTo(0, 1); }, 100);
UI.forceSetting('clip', true); UI.forceSetting('clip', true);
@ -105,7 +105,7 @@ var UI;
} }
} }
UI.setViewClip(); UI.updateViewClip();
UI.setBarPosition(); UI.setBarPosition();
UI.updateVisualState(); UI.updateVisualState();
@ -179,7 +179,7 @@ var UI;
setupWindowEvents: function() { setupWindowEvents: function() {
window.addEventListener( 'resize', function () { window.addEventListener( 'resize', function () {
UI.applyResizeMode(); UI.applyResizeMode();
UI.setViewClip(); UI.updateViewClip();
UI.updateViewDrag(); UI.updateViewDrag();
UI.setBarPosition(); UI.setBarPosition();
} ); } );
@ -381,14 +381,14 @@ var UI;
document.getElementById('noVNC_setting_repeaterID').disabled = connected; document.getElementById('noVNC_setting_repeaterID').disabled = connected;
if (connected) { if (connected) {
UI.setViewClip(); UI.updateViewClip();
UI.setMouseButton(1); UI.setMouseButton(1);
document.getElementById('noVNC_clipboard_button').style.display = "inline"; document.getElementById('noVNC_clipboard_button').style.display = "inline";
document.getElementById('noVNC_keyboard_button').style.display = "inline"; document.getElementById('noVNC_keyboard_button').style.display = "inline";
document.getElementById('noVNC_extra_keys').style.display = ""; document.getElementById('noVNC_extra_keys').style.display = "";
document.getElementById('noVNC_sendCtrlAltDel_button').style.display = "inline"; document.getElementById('noVNC_sendCtrlAltDel_button').style.display = "inline";
} else { } else {
UI.setMouseButton(); UI.hideMouseButton();
document.getElementById('noVNC_clipboard_button').style.display = "none"; document.getElementById('noVNC_clipboard_button').style.display = "none";
document.getElementById('noVNC_keyboard_button').style.display = "none"; document.getElementById('noVNC_keyboard_button').style.display = "none";
document.getElementById('noVNC_extra_keys').style.display = "none"; document.getElementById('noVNC_extra_keys').style.display = "none";
@ -398,7 +398,7 @@ var UI;
// State change disables viewport dragging. // State change disables viewport dragging.
// It is enabled (toggled) by direct click on the button // It is enabled (toggled) by direct click on the button
UI.updateViewDrag(false); UI.setViewDrag(false);
switch (UI.rfb_state) { switch (UI.rfb_state) {
case 'fatal': case 'fatal':
@ -556,7 +556,7 @@ var UI;
// Settings with immediate (non-connected related) effect // Settings with immediate (non-connected related) effect
WebUtil.selectStylesheet(UI.getSetting('stylesheet')); WebUtil.selectStylesheet(UI.getSetting('stylesheet'));
WebUtil.init_logging(UI.getSetting('logging')); WebUtil.init_logging(UI.getSetting('logging'));
UI.setViewClip(); UI.updateViewClip();
UI.updateViewDrag(); UI.updateViewDrag();
//Util.Debug("<< settingsApply"); //Util.Debug("<< settingsApply");
}, },
@ -956,54 +956,52 @@ var UI;
// Set and configure viewport clipping // Set and configure viewport clipping
setViewClip: function(clip) { setViewClip: function(clip) {
UI.updateSetting('clip', clip);
UI.updateViewClip();
},
// Update parameters that depend on the clip setting
updateViewClip: function() {
var display; var display;
if (UI.rfb) { if (!UI.rfb) {
display = UI.rfb.get_display();
} else {
UI.forceSetting('clip', clip);
return; return;
} }
var display = UI.rfb.get_display();
var cur_clip = display.get_viewport(); var cur_clip = display.get_viewport();
var new_clip = UI.getSetting('clip');
if (typeof(clip) !== 'boolean') { if (cur_clip !== new_clip) {
// Use current setting display.set_viewport(new_clip);
clip = UI.getSetting('clip');
} }
if (clip && !cur_clip) { var size = UI.screenSize();
// Turn clipping on
UI.updateSetting('clip', true); if (new_clip && size) {
} else if (!clip && cur_clip) { // When clipping is enabled, the screen is limited to
// Turn clipping off // the size of the browser window.
UI.updateSetting('clip', false); display.set_maxWidth(size.w);
display.set_viewport(false); display.set_maxHeight(size.h);
var screen = document.getElementById('noVNC_screen');
var canvas = document.getElementById('noVNC_canvas');
// Hide potential scrollbars that can skew the position
screen.style.overflow = "hidden";
// The x position marks the left margin of the canvas,
// remove the margin from both sides to keep it centered.
var new_w = size.w - (2 * Util.getPosition(canvas).x);
screen.style.overflow = "visible";
display.viewportChangeSize(new_w, size.h);
} else {
// Disable max dimensions // Disable max dimensions
display.set_maxWidth(0); display.set_maxWidth(0);
display.set_maxHeight(0); display.set_maxHeight(0);
display.viewportChangeSize(); display.viewportChangeSize();
} }
if (UI.getSetting('clip')) {
// If clipping, update clipping settings
display.set_viewport(true);
var size = UI.screenSize();
if (size) {
display.set_maxWidth(size.w);
display.set_maxHeight(size.h);
// Hide potential scrollbars that can skew the position
document.getElementById('noVNC_screen').style.overflow = "hidden";
// The x position marks the left margin of the canvas,
// remove the margin from both sides to keep it centered
var new_w = size.w - (2 * Util.getPosition(document.getElementById('noVNC_canvas')).x);
document.getElementById('noVNC_screen').style.overflow = "visible";
display.viewportChangeSize(new_w, size.h);
}
}
}, },
// Handle special cases where clipping is forced on/off or locked // Handle special cases where clipping is forced on/off or locked
@ -1046,62 +1044,72 @@ var UI;
* VIEWDRAG * VIEWDRAG
* ------v------*/ * ------v------*/
// Update the viewport drag state toggleViewDrag: function() {
updateViewDrag: function(drag) {
if (!UI.rfb) return; if (!UI.rfb) return;
var viewDragButton = document.getElementById('noVNC_view_drag_button'); var drag = UI.rfb.get_viewportDrag();
UI.setViewDrag(!drag);
},
// Set the view drag mode which moves the viewport on mouse drags
setViewDrag: function(drag) {
if (!UI.rfb) return;
UI.rfb.set_viewportDrag(drag);
UI.updateViewDrag();
},
updateViewDrag: function() {
var clipping = false;
// Check if viewport drag is possible. It is only possible // Check if viewport drag is possible. It is only possible
// if the remote display is clipping the client display. // if the remote display is clipping the client display.
if (UI.rfb_state === 'normal' && if (UI.rfb_state === 'normal' &&
UI.rfb.get_display().get_viewport() && UI.rfb.get_display().get_viewport() &&
UI.rfb.get_display().clippingDisplay()) { UI.rfb.get_display().clippingDisplay()) {
clipping = true;
viewDragButton.style.display = "inline";
viewDragButton.disabled = false;
} else {
// The size of the remote display is the same or smaller
// than the client display. Make sure viewport drag isn't
// active when it can't be used.
if (UI.rfb.get_viewportDrag) {
viewDragButton.className = "noVNC_status_button";
UI.rfb.set_viewportDrag(false);
}
// The button is disabled instead of hidden on touch devices
if (UI.rfb_state === 'normal' && UI.isTouchDevice) {
viewDragButton.style.display = "inline";
viewDragButton.disabled = true;
} else {
viewDragButton.style.display = "none";
}
return;
} }
if (typeof(drag) !== "undefined" &&
typeof(drag) !== "object") {
if (drag) {
viewDragButton.className = "noVNC_status_button_selected";
UI.rfb.set_viewportDrag(true);
} else {
viewDragButton.className = "noVNC_status_button";
UI.rfb.set_viewportDrag(false);
}
}
},
toggleViewDrag: function() {
if (!UI.rfb) return;
var viewDragButton = document.getElementById('noVNC_view_drag_button'); var viewDragButton = document.getElementById('noVNC_view_drag_button');
if (UI.rfb.get_viewportDrag()) {
viewDragButton.className = "noVNC_status_button"; if (UI.rfb_state !== 'normal') {
UI.rfb.set_viewportDrag(false); // Always hide when not connected
viewDragButton.style.display = "none";
} else { } else {
viewDragButton.className = "noVNC_status_button_selected"; if (!clipping &&
UI.rfb.set_viewportDrag(true); UI.rfb.get_viewportDrag()) {
// The size of the remote display is the same or smaller
// than the client display. Make sure viewport drag isn't
// active when it can't be used.
UI.rfb.set_viewportDrag(false);
}
if (UI.rfb.get_viewportDrag()) {
viewDragButton.className = "noVNC_status_button_selected";
} else {
viewDragButton.className = "noVNC_status_button";
}
// Different behaviour for touch vs non-touch
// The button is disabled instead of hidden on touch devices
if (UI.isTouchDevice) {
viewDragButton.style.display = "inline";
if (clipping) {
viewDragButton.disabled = false;
} else {
viewDragButton.disabled = true;
}
} else {
viewDragButton.disabled = false;
if (clipping) {
viewDragButton.style.display = "inline";
} else {
viewDragButton.style.display = "none";
}
}
} }
}, },
@ -1292,11 +1300,11 @@ var UI;
* MISC * MISC
* ------v------*/ * ------v------*/
hideMouseButton: function() {
UI.setMouseButton(-1);
},
setMouseButton: function(num) { setMouseButton: function(num) {
if (typeof num === 'undefined') {
// Disable mouse buttons
num = -1;
}
if (UI.rfb) { if (UI.rfb) {
UI.rfb.get_mouse().set_touchButton(num); UI.rfb.get_mouse().set_touchButton(num);
} }