Improved placement and available classes.

This commit is contained in:
Michael Jumper
2012-01-19 14:25:42 -08:00
parent 7ddc68e707
commit 1a88b26c98

View File

@@ -115,7 +115,6 @@ Guacamole.OnScreenKeyboard = function(url) {
// Create element // Create element
var gap = document.createElement("div"); var gap = document.createElement("div");
gap.className = "guacamole-keyboard-gap"; gap.className = "guacamole-keyboard-gap";
gap.textContent = " ";
// Set gap size // Set gap size
if (gap_size) if (gap_size)
@@ -132,24 +131,23 @@ Guacamole.OnScreenKeyboard = function(url) {
// Get attributes // Get attributes
var key_size = e.attributes["size"]; var key_size = e.attributes["size"];
// Create container element
var key_container = document.createElement("div");
key_container.className = "guacamole-keyboard-key-container";
key_container.style.display = "inline-block";
key_container.style.fontSize = unit + "px";
key_container.style.height = unit + "px";
key_container.style.lineHeight = unit + "px";
// Create element // Create element
var key = document.createElement("div"); var key_element = document.createElement("div");
key.className = "guacamole-keyboard-key"; key_element.className = "guacamole-keyboard-key";
key_container.appendChild(key); key_element.style.fontSize = unit + "px";
key_element.style.height = unit + "px";
key_element.style.lineHeight = unit + "px";
// Create cap
var cap_element = document.createElement("div");
cap_element.className = "guacamole-keyboard-cap";
key_element.appendChild(cap_element);
// Set key size // Set key size
if (key_size) if (key_size)
key_container.style.width = parseFloat(key_size.value)*unit + "px"; key_element.style.width = parseFloat(key_size.value)*unit + "px";
else else
key_container.style.width = unit + "px"; key_element.style.width = unit + "px";
parseChildren(e, { parseChildren(e, {
"cap": function cap(e) { "cap": function cap(e) {
@@ -165,13 +163,13 @@ Guacamole.OnScreenKeyboard = function(url) {
// If no requirements, then show cap by default // If no requirements, then show cap by default
if (!required) { if (!required) {
key.textContent = content; cap_element.textContent = content;
} }
} }
}); });
row.appendChild(key_container); row.appendChild(key_element);
} }