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

Rename setting_clip to setting_view_clip 

Clarifies the purpose of the setting in order to avoid mix ups with
clipboard related things.
This commit is contained in:
Samuel Mannehed 2017-09-01 14:52:26 +02:00
parent 409b7fb97e
commit a49ade5fa0
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/ui.js
View File

@ -171,7 +171,7 @@ var UI = {
UI.initSetting('port', port); UI.initSetting('port', port);
UI.initSetting('encrypt', (window.location.protocol === "https:")); UI.initSetting('encrypt', (window.location.protocol === "https:"));
UI.initSetting('cursor', !isTouchDevice); UI.initSetting('cursor', !isTouchDevice);
UI.initSetting('clip', false); UI.initSetting('view_clip', false);
UI.initSetting('resize', 'off'); UI.initSetting('resize', 'off');
UI.initSetting('shared', true); UI.initSetting('shared', true);
UI.initSetting('view_only', false); UI.initSetting('view_only', false);
@ -386,8 +386,8 @@ var UI = {
UI.addSettingChangeHandler('resize'); UI.addSettingChangeHandler('resize');
UI.addSettingChangeHandler('resize', UI.enableDisableViewClip); UI.addSettingChangeHandler('resize', UI.enableDisableViewClip);
UI.addSettingChangeHandler('resize', UI.applyResizeMode); UI.addSettingChangeHandler('resize', UI.applyResizeMode);
UI.addSettingChangeHandler('clip'); UI.addSettingChangeHandler('view_clip');
UI.addSettingChangeHandler('clip', UI.updateViewClip); UI.addSettingChangeHandler('view_clip', UI.updateViewClip);
UI.addSettingChangeHandler('shared'); UI.addSettingChangeHandler('shared');
UI.addSettingChangeHandler('view_only'); UI.addSettingChangeHandler('view_only');
UI.addSettingChangeHandler('view_only', UI.updateViewOnly); UI.addSettingChangeHandler('view_only', UI.updateViewOnly);
@ -892,7 +892,7 @@ var UI = {
UI.updateSetting('cursor', !isTouchDevice); UI.updateSetting('cursor', !isTouchDevice);
UI.disableSetting('cursor'); UI.disableSetting('cursor');
} }
UI.updateSetting('clip'); UI.updateSetting('view_clip');
UI.updateSetting('resize'); UI.updateSetting('resize');
UI.updateSetting('shared'); UI.updateSetting('shared');
UI.updateSetting('view_only'); UI.updateSetting('view_only');
@ -1289,26 +1289,26 @@ var UI = {
/* ------^------- /* ------^-------
* /RESIZE * /RESIZE
* ============== * ==============
* CLIPPING * VIEW CLIPPING
* ------v------*/ * ------v------*/
// Set and configure viewport clipping // Set and configure viewport clipping
setViewClip: function(clip) { setViewClip: function(clip) {
UI.updateSetting('clip', clip); UI.updateSetting('view_clip', clip);
UI.updateViewClip(); UI.updateViewClip();
}, },
// Update parameters that depend on the clip setting // Update parameters that depend on the viewport clip setting
updateViewClip: function() { updateViewClip: function() {
if (!UI.rfb) return; if (!UI.rfb) return;
var display = UI.rfb.get_display(); var display = UI.rfb.get_display();
var cur_clip = display.get_viewport(); var cur_clip = display.get_viewport();
var new_clip = UI.getSetting('clip'); var new_clip = UI.getSetting('view_clip');
var resizeSetting = UI.getSetting('resize'); var resizeSetting = UI.getSetting('resize');
if (resizeSetting === 'downscale' || resizeSetting === 'scale') { if (resizeSetting === 'downscale' || resizeSetting === 'scale') {
// Disable clipping if we are scaling // Disable viewport clipping if we are scaling
new_clip = false; new_clip = false;
} else if (isTouchDevice) { } else if (isTouchDevice) {
// Touch devices usually have shit scrollbars // Touch devices usually have shit scrollbars
@ -1333,20 +1333,20 @@ var UI = {
UI.updateViewDrag(); UI.updateViewDrag();
}, },
// Handle special cases where clipping is forced on/off or locked // Handle special cases where viewport clipping is forced on/off or locked
enableDisableViewClip: function() { enableDisableViewClip: function() {
var resizeSetting = UI.getSetting('resize'); var resizeSetting = UI.getSetting('resize');
// Disable clipping if we are scaling, connected or on touch // Disable clipping if we are scaling, connected or on touch
if (resizeSetting === 'downscale' || resizeSetting === 'scale' || if (resizeSetting === 'downscale' || resizeSetting === 'scale' ||
isTouchDevice) { isTouchDevice) {
UI.disableSetting('clip'); UI.disableSetting('view_clip');
} else { } else {
UI.enableSetting('clip'); UI.enableSetting('view_clip');
} }
}, },
/* ------^------- /* ------^-------
* /CLIPPING * /VIEW CLIPPING
* ============== * ==============
* VIEWDRAG * VIEWDRAG
* ------v------*/ * ------v------*/

2
vnc.html
View File

@ -206,7 +206,7 @@
</li> </li>
<li><hr></li> <li><hr></li>
<li> <li>
<label><input id="noVNC_setting_clip" type="checkbox" /> Clip to Window</label> <label><input id="noVNC_setting_view_clip" type="checkbox" /> Clip to Window</label>
</li> </li>
<li> <li>
<label for="noVNC_setting_resize">Scaling Mode:</label> <label for="noVNC_setting_resize">Scaling Mode:</label>