safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix variable naming conflict (ticket #191). Fix other warnings.

Browse Source
This commit is contained in:
Michael Jumper
2012-09-27 21:05:38 -07:00
parent 05c7031d8e
commit 2c73b682d1
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
guacamole-common-js/src/main/resources/oskeyboard.js
View File

@@ -63,8 +63,8 @@ Guacamole.OnScreenKeyboard = function(url) {
var scaledElements = []; var scaledElements = [];
var modifiers = {}; var modifier_masks = {};
var currentModifier = 1; var next_mask = 1;
/** /**
* Adds a class to an element. * Adds a class to an element.
@@ -135,17 +135,17 @@ Guacamole.OnScreenKeyboard = function(url) {
// Returns a unique power-of-two value for the modifier with the // Returns a unique power-of-two value for the modifier with the
// given name. The same value will be returned for the same modifier. // given name. The same value will be returned for the same modifier.
function getModifier(name) { function getModifierMask(name) {
var value = modifiers[name]; var value = modifier_masks[name];
if (!value) { if (!value) {
// Get current modifier, advance to next // Get current modifier, advance to next
value = currentModifier; value = next_mask;
currentModifier <<= 1; next_mask <<= 1;
// Store value of this modifier // Store value of this modifier
modifiers[name] = value; modifier_masks[name] = value;
} }
@@ -318,7 +318,7 @@ Guacamole.OnScreenKeyboard = function(url) {
// list of required modifiers. // list of required modifiers.
var requirements = e.getAttribute("if").split(","); var requirements = e.getAttribute("if").split(",");
for (var i=0; i<requirements.length; i++) { for (var i=0; i<requirements.length; i++) {
modifierValue |= getModifier(requirements[i]); modifierValue |= getModifierMask(requirements[i]);
addClass(cap_element, "guac-keyboard-requires-" + requirements[i]); addClass(cap_element, "guac-keyboard-requires-" + requirements[i]);
addClass(key_element, "guac-keyboard-uses-" + requirements[i]); addClass(key_element, "guac-keyboard-uses-" + requirements[i]);
} }
@@ -351,13 +351,13 @@ Guacamole.OnScreenKeyboard = function(url) {
// Construct classname for modifier // Construct classname for modifier
var modifierClass = "guac-keyboard-modifier-" + cap.modifier; var modifierClass = "guac-keyboard-modifier-" + cap.modifier;
var modifierFlag = getModifier(cap.modifier); var modifierMask = getModifierMask(cap.modifier);
// Toggle modifier state // Toggle modifier state
modifiers ^= modifierFlag; modifiers ^= modifierMask;
// Activate modifier if pressed // Activate modifier if pressed
if (modifiers & modifierFlag) { if (modifiers & modifierMask) {
addClass(keyboard, modifierClass); addClass(keyboard, modifierClass);
@@ -391,7 +391,7 @@ Guacamole.OnScreenKeyboard = function(url) {
e.preventDefault(); e.preventDefault();
}; }
function release(e) { function release(e) {
@@ -414,7 +414,7 @@ Guacamole.OnScreenKeyboard = function(url) {
e.preventDefault(); e.preventDefault();
}; }
key_element.addEventListener("mousedown", press, true); key_element.addEventListener("mousedown", press, true);
key_element.addEventListener("touchstart", press, true); key_element.addEventListener("touchstart", press, true);