safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 21:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-326: Remove GuacUI component object. Make OSK global.

Browse Source
This commit is contained in:
Michael Jumper
2014-04-22 17:50:12 -07:00
parent 2e6f7c5d8e
commit f091971928
2 changed files with 14 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
guacamole/src/main/webapp/scripts/client-ui.js
View File

@@ -25,23 +25,6 @@
*/
GuacUI.Client = {
/**
* Collection of all Guacamole client UI states.
*/
"states": {
/**
* The normal default Guacamole client UI mode
*/
"INTERACTIVE" : 0,
/**
* Same as INTERACTIVE except with visible on-screen keyboard.
*/
"OSK" : 1
},
/**
* Enumeration of all tunnel-specific error messages for each applicable
* error code.
@@ -261,9 +244,8 @@ GuacUI.Client = {
* which sends key events to the Guacamole client.
*
* @constructor
* @augments GuacUI.Component
*/
GuacUI.Client.OnScreenKeyboard = function() {
GuacUI.Client.OnScreenKeyboard = new (function() {
/**
* Event target. This is a hidden textarea element which will receive
@@ -290,15 +272,21 @@ GuacUI.Client.OnScreenKeyboard = function() {
}
keyboard.onkeydown = function(keysym) {
GuacUI.Client.attachedClient.sendKeyEvent(1, keysym);
if (GuacUI.Client.attachedClient)
GuacUI.Client.attachedClient.sendKeyEvent(1, keysym);
};
keyboard.onkeyup = function(keysym) {
GuacUI.Client.attachedClient.sendKeyEvent(0, keysym);
if (GuacUI.Client.attachedClient)
GuacUI.Client.attachedClient.sendKeyEvent(0, keysym);
};
this.show = function() {
// Only add if not already present
if (keyboard_container.parentNode === document.body)
return;
// Show keyboard
document.body.appendChild(keyboard_container);
@@ -317,6 +305,10 @@ GuacUI.Client.OnScreenKeyboard = function() {
this.hide = function() {
// Only remove if present
if (keyboard_container.parentNode !== document.body)
return;
// Hide keyboard
document.body.removeChild(keyboard_container);
window.clearInterval(keyboard_resize_interval);
@@ -324,24 +316,7 @@ GuacUI.Client.OnScreenKeyboard = function() {
};
};
GuacUI.Client.OnScreenKeyboard.prototype = new GuacUI.Component();
/*
* Show on-screen keyboard during OSK mode only.
*/
GuacUI.StateManager.registerComponent(
new GuacUI.Client.OnScreenKeyboard(),
GuacUI.Client.states.OSK
);
/*
* Set initial state
*/
GuacUI.StateManager.setState(GuacUI.Client.states.INTERACTIVE);
})();
/**
* Modal status display. Displays a message to the user, covering the entire
@@ -351,7 +326,6 @@ GuacUI.StateManager.setState(GuacUI.Client.states.INTERACTIVE);
* components is impossible.
*
* @constructor
* @augments GuacUI.Component
*/
GuacUI.Client.ModalStatus = function(title_text, text, classname, reconnect) {
@@ -430,8 +404,6 @@ GuacUI.Client.ModalStatus = function(title_text, text, classname, reconnect) {
};
GuacUI.Client.ModalStatus.prototype = new GuacUI.Component();
/**
* Monitors a given element for touch events, firing drag-specific events
* based on pre-defined gestures.