From fe9642282b36e5c11aaca847383f312ac34e4d39 Mon Sep 17 00:00:00 2001
From: Tudor Holton <tudor@tudorholton.com>
Date: Sat, 15 Oct 2011 13:42:36 -0400
Subject: [PATCH 01/12] Add style attribute fixes from testing branch to
 issue99 branch.

---
 ample/languages/xul/elements/box.js   | 3 ++-
 ample/languages/xul/elements/image.js | 4 ++--
 ample/languages/xul/elements/label.js | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ample/languages/xul/elements/box.js b/ample/languages/xul/elements/box.js
index d912587f..273051b9 100644
--- a/ample/languages/xul/elements/box.js
+++ b/ample/languages/xul/elements/box.js
@@ -30,6 +30,7 @@ cXULElement_box.prototype.$getTagOpen	= function() {
 	return '<div class="xul-' + this.localName +(this.attributes["class"] ? " " + this.attributes["class"] : "") + '" style="' +
 		(sWidth ? 'width:' + (isNaN(parseInt(sWidth)) ? sWidth : sWidth + 'px;') : '')+
 		(sHeight ? 'height:' + (isNaN(parseInt(sHeight)) ? sHeight : sHeight + 'px;') : '')+
+        this.getAttribute("style")+
 	'">';
 };
 
@@ -38,4 +39,4 @@ cXULElement_box.prototype.$getTagClose	= function() {
 };
 
 // Register Element
-ample.extend(cXULElement_box);
+ample.extend(cXULElement_box);
diff --git a/ample/languages/xul/elements/image.js b/ample/languages/xul/elements/image.js
index acbf0094..995fd5d8 100644
--- a/ample/languages/xul/elements/image.js
+++ b/ample/languages/xul/elements/image.js
@@ -37,8 +37,8 @@ cXULElement_image.prototype._onLoad  = function(oEvent) {
 
 // Element Render: open
 cXULElement_image.prototype.$getTagOpen	= function() {
-    return '<img class="xul-image' +(this.attributes["class"] ? " " + this.attributes["class"] : "") + '"' +(this.attributes["width"] ? ' width="' + this.attributes["width"] + '"' : '')+(this.attributes["height"] ? ' height="' + this.attributes["height"] + '"' : '')+(this.attributes["src"] ? ' src="' + this.attributes["src"] + '"' :'')+ ' onload="ample.$instance(this)._onLoad(event)"/>';
+    return '<img class="xul-image' +(this.attributes["class"] ? " " + this.attributes["class"] : "") + (!this.$isAccessible() ? " xul-image_disabled" : "") + '"' +(this.attributes["width"] ? ' width="' + this.attributes["width"] + '"' : '')+(this.attributes["height"] ? ' height="' + this.attributes["height"] + '"' : '') + (this.hasAttribute("style") ? ' style="' + this.getAttribute("style") + '"' : '')+(this.attributes["src"] ? ' src="' + this.attributes["src"] + '"' :'')+ ' onload="ample.$instance(this)._onLoad(event)"/>';
 };
 
 // Register Element
-ample.extend(cXULElement_image);
+ample.extend(cXULElement_image);
diff --git a/ample/languages/xul/elements/label.js b/ample/languages/xul/elements/label.js
index 83a2e9a4..b77b394d 100644
--- a/ample/languages/xul/elements/label.js
+++ b/ample/languages/xul/elements/label.js
@@ -40,7 +40,7 @@ cXULElement_label.handlers	= {
 
 // Element Render: open
 cXULElement_label.prototype.$getTagOpen	= function() {
-    return '<label class="xul-label' +(this.attributes["class"] ? " " + this.attributes["class"] : "")+ '">' +(this.attributes["value"] ? this.attributes["value"] : '');
+    return '<label class="xul-label' +(this.attributes["class"] ? " " + this.attributes["class"] : "") + (!this.$isAccessible() ? " xul-label_disabled" : "") + '"' + (this.hasAttribute("style") ? ' style="' + this.getAttribute("style") + '"' : '')+ '>' +(this.attributes["value"] ? this.attributes["value"] : '');
 };
 
 // Element Render: close
@@ -49,4 +49,4 @@ cXULElement_label.prototype.$getTagClose	= function() {
 };
 
 // Register Element
-ample.extend(cXULElement_label);
+ample.extend(cXULElement_label);

From 43a4d0f2738dd82b101ecc7f9b29f1c7911f2236 Mon Sep 17 00:00:00 2001
From: Tudor Holton <tudor@tudorholton.com>
Date: Fri, 6 Jan 2012 18:16:49 -0500
Subject: [PATCH 02/12] Fix failure to produce detailed error when parsing xml
 failed on chrome.

---
 ample/runtime/browser.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/ample/runtime/browser.js b/ample/runtime/browser.js
index f114051a..19e6bc63 100644
--- a/ample/runtime/browser.js
+++ b/ample/runtime/browser.js
@@ -776,9 +776,12 @@ function fBrowser_getResponseDocument(oRequest) {
 		// Bugfix FF4 (remote XUL)
 		if (bGecko)
 			oDocument	= fBrowser_parseXML(sText);
+
+		if (bWebKit && !oDocument)
+			oDocument	= fBrowser_parseXML(sText);
 	}
 	// Check if there is no error in document
-	if (!oDocument || ((bTrident && nVersion < 9 && oDocument.parseError != 0) || !oDocument.documentElement || oDocument.getElementsByTagName("parsererror").length))
+	if (!oDocument || ((bTrident && nVersion < 9 && oDocument.parseError != 0) || !oDocument.documentElement || oDocument.getElementsByTagName("parsererror").length <= 0))
 		return null;
 	return oDocument;
 };
@@ -1109,11 +1112,11 @@ function fBrowser_processScripts() {
 		else
 		if (sType == "application/ample+javascript" || sType == "text/ample+javascript") {
 			if (sSrc)
-				sText	= fBrowser_load(sSrc, "text/javascript");
+				oRequest	= fBrowser_load(sSrc, "text/javascript");
 
 			// Try executing
 			try {
-				fBrowser_eval(sText);
+				fBrowser_eval(oRequest.responseText);
 			} catch (oException) {
 //->Debug
 				fUtilities_warn(sGUARD_JAVASCRIPT_SYNTAX_WRN, [oException.message]);
@@ -1268,7 +1271,7 @@ fBrowser_attachEvent(window, "unload", function(oEvent) {
 
 	// Finalize
 	fAmple_finalize();
-});
+});
 
 function fAmple_changeReadyState(sValue) {
 	//
@@ -1347,4 +1350,4 @@ function fAmple_finalize() {
 
 	// free memory
     fDocument_unregister(oAmple_document, oAmple_root);
-};
\ No newline at end of file
+};

From 7b8baaf9c6eec4b69d6dd953c95eb078568bc842 Mon Sep 17 00:00:00 2001
From: Tudor Holton <tudor@tudorholton.com>
Date: Sun, 8 Jan 2012 18:52:25 -0500
Subject: [PATCH 03/12] Added catch for 'script error' message when no parse
 error exists by either means.

---
 ample/runtime/browser.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ample/runtime/browser.js b/ample/runtime/browser.js
index 19e6bc63..a5fb3223 100644
--- a/ample/runtime/browser.js
+++ b/ample/runtime/browser.js
@@ -1102,6 +1102,12 @@ function fBrowser_processScripts() {
 													oDocument.parseError.srcText + '\n' +
 													new cArray(oDocument.parseError.linepos).join('-') + '^';
 			    }
+                //Unknown failure on our part (No Document or Document ParserError).
+                else {
+					oElementNew.innerText	= 'XML Parsing Error: ' + 'Unknown failure to parse.' + '\n' +
+													'Location: ' + (oUALocation) + '\n';
+                    oElementNew.innerText	+= 'Document ' + (oDocument?'exists':'does not exist'); 
+                }
 //<-Debug
 
 //->Debug

From ff24c73897b34aa72dcb041752c920681556a409 Mon Sep 17 00:00:00 2001
From: Tudor Holton <tudor@tudorholton.com>
Date: Sun, 8 Jan 2012 20:06:06 -0500
Subject: [PATCH 04/12] Add additional wording to explain error.

---
 ample/runtime/browser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ample/runtime/browser.js b/ample/runtime/browser.js
index a5fb3223..f044b849 100644
--- a/ample/runtime/browser.js
+++ b/ample/runtime/browser.js
@@ -1104,7 +1104,7 @@ function fBrowser_processScripts() {
 			    }
                 //Unknown failure on our part (No Document or Document ParserError).
                 else {
-					oElementNew.innerText	= 'XML Parsing Error: ' + 'Unknown failure to parse.' + '\n' +
+					oElementNew.innerText	= 'XML Parsing Error: ' + 'Unknown failure to parse.  This should not happen.  It means that the browser did not return a parsing error we understand.' + '\n' +
 													'Location: ' + (oUALocation) + '\n';
                     oElementNew.innerText	+= 'Document ' + (oDocument?'exists':'does not exist'); 
                 }

From 23f9798954159518c8172567e7918f60d4966327 Mon Sep 17 00:00:00 2001
From: Tudor Holton <tudor@tudorholton.com>
Date: Tue, 17 Jan 2012 15:26:51 -0500
Subject: [PATCH 05/12] Add in simple DTD processing so that entities in XUL
 files will be replaced by their correct values.

---
 ample/runtime/browser.js | 47 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/ample/runtime/browser.js b/ample/runtime/browser.js
index f044b849..967c3a49 100644
--- a/ample/runtime/browser.js
+++ b/ample/runtime/browser.js
@@ -14,6 +14,7 @@ var oBrowser_factory	= oUADocument.createElement("span"),
 	oBrowser_body		= null,
 	hBrowser_keyIdentifiers	= fUtilities_stringToHash("8:Backspace;9:Tab;13:Enter;16:Shift;17:Control;18:Alt;20:CapsLock;27:Esc;33:PageUp;34:PageDown;35:End;36:Home;37:Left;38:Up;39:Right;40:Down;45:Insert;46:Backspace;91:Win;112:F1;113:F2;114:F3;115:F4;116:F5;117:F6;118:F7;119:F8;120:F9;121:F10;122:F11;123:F12;127:Del"),
 	hBrowser_cssColors		= fUtilities_stringToHash("aliceblue:F0F8FF;antiquewhite:FAEBD7;aqua:00FFFF;aquamarine:7FFFD4;azure:F0FFFF;beige:F5F5DC;bisque:FFE4C4;black:000000;blanchedalmond:FFEBCD;blue:0000FF;blueviolet:8A2BE2;brown:A52A2A;burlywood:DEB887;cadetblue:5F9EA0;chartreuse:7FFF00;chocolate:D2691E;coral:FF7F50;cornflowerblue:6495ED;cornsilk:FFF8DC;crimson:DC143C;cyan:00FFFF;darkblue:00008B;darkcyan:008B8B;darkgoldenrod:B8860B;darkgray:A9A9A9;darkgreen:006400;darkkhaki:BDB76B;darkmagenta:8B008B;darkolivegreen:556B2F;darkorange:FF8C00;darkorchid:9932CC;darkred:8B0000;darksalmon:E9967A;darkseagreen:8FBC8F;darkslateblue:483D8B;darkslategray:2F4F4F;darkturquoise:00CED1;darkviolet:9400D3;deeppink:FF1493;deepskyblue:00BFFF;dimgray:696969;dodgerblue:1E90FF;firebrick:B22222;floralwhite:FFFAF0;forestgreen:228B22;fuchsia:FF00FF;gainsboro:DCDCDC;ghostwhite:F8F8FF;gold:FFD700;goldenrod:DAA520;gray:808080;green:008000;greenyellow:ADFF2F;honeydew:F0FFF0;hotpink:FF69B4;indianred:CD5C5C;indigo:4B0082;ivory:FFFFF0;khaki:F0E68C;lavender:E6E6FA;lavenderblush:FFF0F5;lawngreen:7CFC00;lemonchiffon:FFFACD;lightblue:ADD8E6;lightcoral:F08080;lightcyan:E0FFFF;lightgoldenrodyellow:FAFAD2;lightgreen:90EE90;lightgrey:D3D3D3;lightpink:FFB6C1;lightsalmon:FFA07A;lightseagreen:20B2AA;lightskyblue:87CEFA;lightslategray:778899;lightsteelblue:B0C4DE;lightyellow:FFFFE0;lime:00FF00;limegreen:32CD32;linen:FAF0E6;magenta:FF00FF;maroon:800000;mediumaquamarine:66CDAA;mediumblue:0000CD;mediumorchid:BA55D3;mediumpurple:9370DB;mediumseagreen:3CB371;mediumslateblue:7B68EE;mediumspringgreen:00FA9A;mediumturquoise:48D1CC;mediumvioletred:C71585;midnightblue:191970;mintcream:F5FFFA;mistyrose:FFE4E1;moccasin:FFE4B5;navajowhite:FFDEAD;navy:000080;oldlace:FDF5E6;olive:808000;olivedrab:6B8E23;orange:FFA500;orangered:FF4500;orchid:DA70D6;palegoldenrod:EEE8AA;palegreen:98FB98;paleturquoise:AFEEEE;palevioletred:DB7093;papayawhip:FFEFD5;peachpuff:FFDAB9;peru:CD853F;pink:FFC0CB;plum:DDA0DD;powderblue:B0E0E6;purple:800080;red:FF0000;rosybrown:BC8F8F;royalblue:4169E1;saddlebrown:8B4513;salmon:FA8072;sandybrown:F4A460;seagreen:2E8B57;seashell:FFF5EE;sienna:A0522D;silver:C0C0C0;skyblue:87CEEB;slateblue:6A5ACD;slategray:708090;snow:FFFAFA;springgreen:00FF7F;steelblue:4682B4;tan:D2B48C;teal:008080;thistle:D8BFD8;tomato:FF6347;turquoise:40E0D0;violet:EE82EE;wheat:F5DEB3;white:FFFFFF;whitesmoke:F5F5F5;yellow:FFFF00;yellowgreen:9ACD32", '#'),
+    hBrowser_entities   = {},
 	aBrowser_mouseNodes	= new cNodeList,
 	oBrowser_mouseNode	= null,
 	oBrowser_captureNode= null,		// Set in Capture manager
@@ -761,9 +762,47 @@ function fBrowser_parseXML(sText) {
 	// Bugfix FF4 (remote XUL)
 	if (bGecko)
 		sText	= sText.replace(new cRegExp(sNS_XUL, 'g'), sNS_XUL + '#');
+    //TODO: Parse DocTypes and DTDs properly.
+    //HACK START: To make translations work properly by processing DocTypes and entities in DTDs.
+    fBrowser_parseDoctypes(sText);
+    sText = fBrowser_parseEntities(sText);
+    //HACK END
 	return new cDOMParser().parseFromString(sText, "text/xml");
 };
 
+//HACK START: To make translations work properly by processing DocTypes and entities in DTDs.
+function fBrowser_parseEntities(sText) {
+    for (var sEntityName in hBrowser_entities) {
+		sText	= sText.replace(new cRegExp('&' + sEntityName + ';', 'g'), hBrowser_entities[sEntityName]);        
+    }
+    return sText;
+}
+
+function fBrowser_parseDoctypes(sText) {
+    // For each DOCTYPE clause
+    var aMatchDocType, oDocTypePattern = /<!DOCTYPE\s+(\S+)(\s+(SYSTEM|PUBLIC))?(\s+"(.+)")?(\s+\[([^\]]+)\])?\s*>/img;
+
+    while (result = oDocTypePattern.exec(sText)) {
+        if (result[3] == 'SYSTEM' && result[5]) {
+            //External DTD by URL
+            var oRequest = fBrowser_load(result[5],'application/xml-dtd');
+            fBrowser_parseDTD(oRequest.sText);
+        }
+        if (result[7])
+            fBrowser_parseDTD(result[7]);
+    }
+
+};
+
+function fBrowser_parseDTD(sText) {
+    // Process entities in DTDs
+    var aMatchEntity, oEntityPattern = /<!ENTITY\s+(\S+)\s+("([^"]*)"|'([^']*)')\s*>/img;
+    while (aMatchEntity = oEntityPattern.exec(result[7])) {
+        hBrowser_entities[aMatchEntity[1]] = aMatchEntity[3];
+    }
+}
+//HACK END
+
 function fBrowser_getResponseDocument(oRequest) {
 	var oDocument	= oRequest.responseXML,
 		sText		= oRequest.responseText;
@@ -781,7 +820,13 @@ function fBrowser_getResponseDocument(oRequest) {
 			oDocument	= fBrowser_parseXML(sText);
 	}
 	// Check if there is no error in document
-	if (!oDocument || ((bTrident && nVersion < 9 && oDocument.parseError != 0) || !oDocument.documentElement || oDocument.getElementsByTagName("parsererror").length <= 0))
+	if (!oDocument)
+		return null;
+    if (bTrident && nVersion < 9 && oDocument.parseError != 0)
+		return null;
+    if (!oDocument.documentElement)
+		return null;
+    if (oDocument.getElementsByTagName("parsererror").length > 0)
 		return null;
 	return oDocument;
 };

From 0fc6c209e63feb401551884517bef1d0895b8bc6 Mon Sep 17 00:00:00 2001
From: Tudor Holton <tudor@tudorholton.com>
Date: Tue, 24 Jan 2012 00:25:45 -0500
Subject: [PATCH 06/12] New keyboard example application.  Keyboard and log
 displayed. No key assignments yet.

---
 examples/applications/keyboard/index.html | 142 ++++++++++++++++++++++
 1 file changed, 142 insertions(+)
 create mode 100644 examples/applications/keyboard/index.html

diff --git a/examples/applications/keyboard/index.html b/examples/applications/keyboard/index.html
new file mode 100644
index 00000000..af28bc0e
--- /dev/null
+++ b/examples/applications/keyboard/index.html
@@ -0,0 +1,142 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<title>Ample Keyboard Demo</title>
+		<script type="text/javascript" src="../../../ample/runtime.js"></script>
+		<script type="text/javascript" src="../../../ample/languages/xhtml/xhtml.js"></script>
+		<script type="text/javascript" src="../../../ample/languages/xul/xul.js"></script>
+		<link type="text/ample+css" href="../../../ample/languages/xul/themes/default/style.css" rel="stylesheet"/>
+
+		<style type="text/css">
+			html, body {
+				width:	100%;
+				height: 100%;
+				padding:0;
+				margin:	0;
+				overflow:hidden;
+			}
+			body {
+				border: 0;
+				font-family: Arial;
+				font-size: 13px;
+			}
+		</style>
+
+	</head>
+	<body bgcolor="silver">
+        <script type="application/ample+xml">
+        <xul:keyset>
+            
+        </xul:keyset>
+        <xul:hbox xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:aml="http://www.amplesdk.com/ns/aml" flex="1">
+            <xul:vbox flex="2">
+            <!-- Keyboard -->
+                <!-- Line 0: F1-F12 <PrtSc> <Pause> <Insert> <Del> -->
+                <xul:hbox flex="1">
+                    <xul:button flex="1" id="F1" label="F1" />
+                    <xul:button flex="1" id="F2" label="F2" />
+                    <xul:button flex="1" id="F3" label="F3" />
+                    <xul:button flex="1" id="F4" label="F4" />
+                    <xul:button flex="1" id="F5" label="F5" />
+                    <xul:button flex="1" id="F6" label="F6" />
+                    <xul:button flex="1" id="F7" label="F7" />
+                    <xul:button flex="1" id="F8" label="F8" />
+                    <xul:button flex="1" id="F9" label="F9" />
+                    <xul:button flex="1" id="F10" label="F10" />
+                    <xul:button flex="1" id="F11" label="F11" />
+                    <xul:button flex="1" id="F12" label="F12" />
+                    <xul:button flex="1" id="PrtSc" label="PrtSc" />
+                    <xul:button flex="1" id="Ins" label="Ins" />
+                    <xul:button flex="1" id="Del" label="Del" />
+                </xul:hbox>
+                <!-- Line 1: `1234567890-=<bs> -->
+                <xul:hbox flex="1">
+                    <xul:button flex="1" id="`" label="`" />
+                    <xul:button flex="1" id="1" label="1" />
+                    <xul:button flex="1" id="2" label="2" />
+                    <xul:button flex="1" id="3" label="3" />
+                    <xul:button flex="1" id="4" label="4" />
+                    <xul:button flex="1" id="5" label="5" />
+                    <xul:button flex="1" id="6" label="6" />
+                    <xul:button flex="1" id="7" label="7" />
+                    <xul:button flex="1" id="8" label="8" />
+                    <xul:button flex="1" id="9" label="9" />
+                    <xul:button flex="1" id="0" label="0" />
+                    <xul:button flex="1" id="-" label="-" />
+                    <xul:button flex="1" id="=" label="=" />
+                    <xul:button flex="1" id="BKSP" label="BKSP" />
+                </xul:hbox>
+                <!-- Line 2: <tab>QWERTYUIOOP[] -->            
+                <xul:hbox flex="1">
+                    <xul:button flex="1" id="TAB" label="TAB" />
+                    <xul:button flex="1" id="Q" label="Q" />
+                    <xul:button flex="1" id="W" label="W" />
+                    <xul:button flex="1" id="E" label="E" />
+                    <xul:button flex="1" id="R" label="R" />
+                    <xul:button flex="1" id="T" label="T" />
+                    <xul:button flex="1" id="Y" label="Y" />
+                    <xul:button flex="1" id="U" label="U" />
+                    <xul:button flex="1" id="I" label="I" />
+                    <xul:button flex="1" id="O" label="O" />
+                    <xul:button flex="1" id="P" label="P" />
+                    <xul:button flex="1" id="[" label="[" />
+                    <xul:button flex="1" id="]" label="]" />
+                </xul:hbox>
+                <!-- Line 3: <caps>ASDFGHJKL;'\<enter> -->            
+                <xul:hbox flex="1">
+                    <xul:button flex="1" id="CAPS" label="CAPS" />
+                    <xul:button flex="1" id="A" label="A" />
+                    <xul:button flex="1" id="S" label="S" />
+                    <xul:button flex="1" id="D" label="D" />
+                    <xul:button flex="1" id="F" label="F" />
+                    <xul:button flex="1" id="G" label="G" />
+                    <xul:button flex="1" id="H" label="H" />
+                    <xul:button flex="1" id="J" label="J" />
+                    <xul:button flex="1" id="K" label="K" />
+                    <xul:button flex="1" id="L" label="L" />
+                    <xul:button flex="1" id=";" label=";" />
+                    <xul:button flex="1" id="&apos;" label="&apos;" />
+                    <xul:button flex="1" id="\" label="\" />
+                    <xul:button flex="1" id="ENTER" label="ENTER" />
+                </xul:hbox>
+                <!-- Line 4: <shift>ZXCVBNM,./<shift> -->
+                <xul:hbox flex="1">
+                    <xul:button flex="1" id="SHIFT" label="SHIFT" />
+                    <xul:button flex="1" id="\" label="\" />
+                    <xul:button flex="1" id="Z" label="Z" />
+                    <xul:button flex="1" id="X" label="X" />
+                    <xul:button flex="1" id="C" label="C" />
+                    <xul:button flex="1" id="V" label="V" />
+                    <xul:button flex="1" id="B" label="B" />
+                    <xul:button flex="1" id="N" label="N" />
+                    <xul:button flex="1" id="M" label="M" />
+                    <xul:button flex="1" id="," label="," />
+                    <xul:button flex="1" id="." label="." />
+                    <xul:button flex="1" id="/" label="/" />
+                    <xul:button flex="1" id="SHIFT" label="SHIFT" />
+                </xul:hbox>
+                <!-- Line 5: <ctrl> <meta> <alt> <space> <alt> <meta2> <ctrl> <arrows> -->
+                <xul:hbox flex="1">
+                    <xul:button flex="1" id="CTRL" label="CTRL" />
+                    <xul:button flex="1" id="META" label="META" />
+                    <xul:button flex="1" id="ALT" label="ALT" />
+                    <xul:button flex="1" id="SPACE" label="SPACE" />
+                    <xul:button flex="1" id="ALT" label="ALT" />
+                    <xul:button flex="1" id="META2" label="META2" />
+                    <xul:button flex="1" id="CTRL" label="CTRL" />
+                    <xul:button flex="1" id="LEFT" label="LEFT" />
+                    <xul:button flex="1" id="^" label="^" />
+                    <xul:button flex="1" id="v" label="v" />
+                    <xul:button flex="1" id="RIGHT" label="RIGHT" />
+                </xul:hbox>
+            </xul:vbox>
+            <xul:vbox flex="1">
+            <!-- Console -->
+                <xul:scrollbox id="keylog">
+                    <xul:label>All key operations will be logged here.</xul:label>
+                </xul:scrollbox>         
+            </xul:vbox>
+        </xul:hbox>
+        </script>
+	</body>
+</html>

From 4a05f4dad146e01640069bdaa0b04fb8986df3b9 Mon Sep 17 00:00:00 2001
From: Tudor Holton <tudor@tudorholton.com>
Date: Sat, 28 Jan 2012 00:50:43 -0500
Subject: [PATCH 07/12] Some of the keys now work. Log works.

---
 examples/applications/keyboard/index.html | 367 +++++++++++++++++-----
 1 file changed, 284 insertions(+), 83 deletions(-)

diff --git a/examples/applications/keyboard/index.html b/examples/applications/keyboard/index.html
index af28bc0e..db9bcd6d 100644
--- a/examples/applications/keyboard/index.html
+++ b/examples/applications/keyboard/index.html
@@ -22,118 +22,319 @@
 			}
 		</style>
 
+        <script type="application/javascript">
+            var keymap = {
+                "U+000D":"CR",
+                "U+000E":"SO",
+                "U+000F":"SI",
+                "U+001B":"ESC",
+                "U+0020":"SP",
+                "U+0021":"!",
+                "U+0022":"\"",
+                "U+0023":"#",
+                "U+0024":"$",
+                "U+0025":"%",
+                "U+0026":"&",
+                "U+0027":"'",
+                "U+0028":"(",
+                "U+0029":")",
+                "U+002A":"*",
+                "U+002B":"0",
+                "U+002C":",",
+                "U+002D":"-",
+                "U+002E":".",
+                "U+0030":"0",
+                "U+0031":"1",
+                "U+0032":"2",
+                "U+0033":"3",
+                "U+0034":"4",
+                "U+0035":"5",
+                "U+0036":"6",
+                "U+0037":"7",
+                "U+0038":"8",
+                "U+0039":"9",
+                "U+003A":":",
+                "U+003B":";",
+                "U+003C":"<",
+                "U+003D":"=",
+                "U+003E":">",
+                "U+003F":"?",
+                "U+0040":"@",
+                "U+0041":"A",
+                "U+0042":"B",
+                "U+0043":"C",
+                "U+0044":"D",
+                "U+0045":"E",
+                "U+0046":"F",
+                "U+0047":"G",
+                "U+0048":"H",
+                "U+0049":"I",
+                "U+004A":"J",
+                "U+004B":"K",
+                "U+004C":"L",
+                "U+004D":"M",
+                "U+004E":"N",
+                "U+004F":"O",
+                "U+0050":"P",
+                "U+0051":"Q",
+                "U+0052":"R",
+                "U+0053":"S",
+                "U+0054":"T",
+                "U+0055":"U",
+                "U+0056":"V",
+                "U+0057":"W",
+                "U+0058":"X",
+                "U+0059":"Y",
+                "U+005A":"Z",
+                "U+005B":"[",
+                "U+005C":"\\",
+                "U+005D":"]",
+                "U+005E":"^",
+                "U+005F":"_",
+                "U+0060":"`",
+                "U+0061":"a",
+                "U+0062":"b",
+                "U+0063":"c",
+                "U+0064":"d",
+                "U+0065":"e",
+                "U+0066":"f",
+                "U+0067":"g",
+                "U+0068":"h",
+                "U+0069":"i",
+                "U+006A":"j",
+                "U+006B":"k",
+                "U+006C":"l",
+                "U+006D":"m",
+                "U+006E":"n",
+                "U+006F":"o",
+                "U+0070":"p",
+                "U+0071":"q",
+                "U+0072":"r",
+                "U+0073":"s",
+                "U+0074":"t",
+                "U+0075":"u",
+                "U+0076":"v",
+                "U+0077":"w",
+                "U+0078":"x",
+                "U+0079":"y",
+                "U+007A":"z",
+                "U+007B":"{",
+                "U+007C":"|",
+                "U+007D":"}"
+            };
+
+            function press(key) {
+                var button = ample.getElementById(keymap[key]);
+                button.doCommand();
+            }
+    
+            function printKey() {
+                var str = keymap[event.keyIdentifier];
+                //alert(str);
+                var message = '<xul:label xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xi="http://www.w3.org/2001/XInclude">'+ str + ' key pressed.</xul:label>';
+                ample.query('#keylog').append(message);
+            }
+        </script>
 	</head>
 	<body bgcolor="silver">
         <script type="application/ample+xml">
-        <xul:keyset>
-            
+        <xul:commandset xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:aml="http://www.amplesdk.com/ns/aml">
+            <xul:command id="buttonpressed" oncommand="printKey();" />
+        </xul:commandset>
+        <xul:keyset xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:aml="http://www.amplesdk.com/ns/aml" oncommand="press(event.target.getAttribute('key'));">
+                    <xul:key key="F1" />
+                    <xul:key key="F2" />
+                    <xul:key key="F3" />
+                    <xul:key key="F4" />
+                    <xul:key key="F5" />
+                    <xul:key key="F6" />
+                    <xul:key key="F7" />
+                    <xul:key key="F8" />
+                    <xul:key key="F9" />
+                    <xul:key key="F10" />
+                    <xul:key key="F11" />
+                    <xul:key key="F12" />
+                    <xul:key key="PrtSc" />
+                    <xul:key key="Ins" />
+                    <xul:key key="Del" />
+                <!-- Line 1: `1234567890-=<bs> -->
+                    <xul:key key="`" />
+                    <xul:key key="U+0031" />
+                    <xul:key key="U+0032" />
+                    <xul:key key="U+0033" />
+                    <xul:key key="U+0034" />
+                    <xul:key key="U+0035" />
+                    <xul:key key="U+0036" />
+                    <xul:key key="U+0037" />
+                    <xul:key key="U+0038" />
+                    <xul:key key="U+0039" />
+                    <xul:key key="U+0030" />
+                    <xul:key key="-" />
+                    <xul:key key="=" />
+                    <xul:key key="BKSP" />
+                <!-- Line 2: <tab>QWERTYUIOOP[] -->            
+                    <xul:key key="TAB" />
+                    <xul:key key="U+0051" />
+                    <xul:key key="U+0057" />
+                    <xul:key key="U+0045" />
+                    <xul:key key="U+0052" />
+                    <xul:key key="U+0054" />
+                    <xul:key key="U+0059" />
+                    <xul:key key="U+0055" />
+                    <xul:key key="U+0049" />
+                    <xul:key key="U+004F" />
+                    <xul:key key="U+0050" />
+                    <xul:key key="U+005B" />
+                    <xul:key key="U+005D" />
+                <!-- Line 3: <caps>ASDFGHJKL;'\<enter> -->            
+                    <xul:key key="CAPS" />
+                    <xul:key key="U+0041" />
+                    <xul:key key="U+0053" />
+                    <xul:key key="U+0044" />
+                    <xul:key key="U+0046" />
+                    <xul:key key="U+0047" />
+                    <xul:key key="U+0048" />
+                    <xul:key key="U+004A" />
+                    <xul:key key="U+004B" />
+                    <xul:key key="U+004C" />
+                    <xul:key key=";" />
+                    <xul:key key="&apos;" />
+                    <xul:key key="\" />
+                    <xul:key key="ENTER" />
+                <!-- Line 4: <shift>ZXCVBNM,./<shift> -->
+                    <xul:key key="SHIFT" />
+                    <xul:key key="\" />
+                    <xul:key key="U+005A" />
+                    <xul:key key="U+0058" />
+                    <xul:key key="U+0043" />
+                    <xul:key key="U+0056" />
+                    <xul:key key="U+0042" />
+                    <xul:key key="U+004E" />
+                    <xul:key key="U+004D" />
+                    <xul:key key="," />
+                    <xul:key key="." />
+                    <xul:key key="/" />
+                    <xul:key key="SHIFT" />
+                <!-- Line 5: <ctrl> <meta> <alt> <space> <alt> <meta2> <ctrl> <arrows> -->
+                    <xul:key key="CTRL" />
+                    <xul:key key="META" />
+                    <xul:key key="ALT" />
+                    <xul:key key="SPACE" />
+                    <xul:key key="ALT" />
+                    <xul:key key="META2" />
+                    <xul:key key="CTRL" />
+                    <xul:key key="LEFT" />
+                    <xul:key key="^" />
+                    <xul:key key="v" />
+                    <xul:key key="RIGHT" />
         </xul:keyset>
         <xul:hbox xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:aml="http://www.amplesdk.com/ns/aml" flex="1">
             <xul:vbox flex="2">
             <!-- Keyboard -->
                 <!-- Line 0: F1-F12 <PrtSc> <Pause> <Insert> <Del> -->
                 <xul:hbox flex="1">
-                    <xul:button flex="1" id="F1" label="F1" />
-                    <xul:button flex="1" id="F2" label="F2" />
-                    <xul:button flex="1" id="F3" label="F3" />
-                    <xul:button flex="1" id="F4" label="F4" />
-                    <xul:button flex="1" id="F5" label="F5" />
-                    <xul:button flex="1" id="F6" label="F6" />
-                    <xul:button flex="1" id="F7" label="F7" />
-                    <xul:button flex="1" id="F8" label="F8" />
-                    <xul:button flex="1" id="F9" label="F9" />
-                    <xul:button flex="1" id="F10" label="F10" />
-                    <xul:button flex="1" id="F11" label="F11" />
-                    <xul:button flex="1" id="F12" label="F12" />
-                    <xul:button flex="1" id="PrtSc" label="PrtSc" />
-                    <xul:button flex="1" id="Ins" label="Ins" />
-                    <xul:button flex="1" id="Del" label="Del" />
+                    <xul:button flex="1" command="buttonpressed" id="F1" label="F1" />
+                    <xul:button flex="1" command="buttonpressed" id="F2" label="F2" />
+                    <xul:button flex="1" command="buttonpressed" id="F3" label="F3" />
+                    <xul:button flex="1" command="buttonpressed" id="F4" label="F4" />
+                    <xul:button flex="1" command="buttonpressed" id="F5" label="F5" />
+                    <xul:button flex="1" command="buttonpressed" id="F6" label="F6" />
+                    <xul:button flex="1" command="buttonpressed" id="F7" label="F7" />
+                    <xul:button flex="1" command="buttonpressed" id="F8" label="F8" />
+                    <xul:button flex="1" command="buttonpressed" id="F9" label="F9" />
+                    <xul:button flex="1" command="buttonpressed" id="F10" label="F10" />
+                    <xul:button flex="1" command="buttonpressed" id="F11" label="F11" />
+                    <xul:button flex="1" command="buttonpressed" id="F12" label="F12" />
+                    <xul:button flex="1" command="buttonpressed" id="PrtSc" label="PrtSc" />
+                    <xul:button flex="1" command="buttonpressed" id="Ins" label="Ins" />
+                    <xul:button flex="1" command="buttonpressed" id="Del" label="Del" />
                 </xul:hbox>
                 <!-- Line 1: `1234567890-=<bs> -->
                 <xul:hbox flex="1">
-                    <xul:button flex="1" id="`" label="`" />
-                    <xul:button flex="1" id="1" label="1" />
-                    <xul:button flex="1" id="2" label="2" />
-                    <xul:button flex="1" id="3" label="3" />
-                    <xul:button flex="1" id="4" label="4" />
-                    <xul:button flex="1" id="5" label="5" />
-                    <xul:button flex="1" id="6" label="6" />
-                    <xul:button flex="1" id="7" label="7" />
-                    <xul:button flex="1" id="8" label="8" />
-                    <xul:button flex="1" id="9" label="9" />
-                    <xul:button flex="1" id="0" label="0" />
-                    <xul:button flex="1" id="-" label="-" />
-                    <xul:button flex="1" id="=" label="=" />
-                    <xul:button flex="1" id="BKSP" label="BKSP" />
+                    <xul:button flex="1" command="buttonpressed" id="`" label="`" />
+                    <xul:button flex="1" command="buttonpressed" id="1" label="1" />
+                    <xul:button flex="1" command="buttonpressed" id="2" label="2" />
+                    <xul:button flex="1" command="buttonpressed" id="3" label="3" />
+                    <xul:button flex="1" command="buttonpressed" id="4" label="4" />
+                    <xul:button flex="1" command="buttonpressed" id="5" label="5" />
+                    <xul:button flex="1" command="buttonpressed" id="6" label="6" />
+                    <xul:button flex="1" command="buttonpressed" id="7" label="7" />
+                    <xul:button flex="1" command="buttonpressed" id="8" label="8" />
+                    <xul:button flex="1" command="buttonpressed" id="9" label="9" />
+                    <xul:button flex="1" command="buttonpressed" id="0" label="0" />
+                    <xul:button flex="1" command="buttonpressed" id="-" label="-" />
+                    <xul:button flex="1" command="buttonpressed" id="=" label="=" />
+                    <xul:button flex="1" command="buttonpressed" id="BKSP" label="BKSP" />
                 </xul:hbox>
                 <!-- Line 2: <tab>QWERTYUIOOP[] -->            
                 <xul:hbox flex="1">
-                    <xul:button flex="1" id="TAB" label="TAB" />
-                    <xul:button flex="1" id="Q" label="Q" />
-                    <xul:button flex="1" id="W" label="W" />
-                    <xul:button flex="1" id="E" label="E" />
-                    <xul:button flex="1" id="R" label="R" />
-                    <xul:button flex="1" id="T" label="T" />
-                    <xul:button flex="1" id="Y" label="Y" />
-                    <xul:button flex="1" id="U" label="U" />
-                    <xul:button flex="1" id="I" label="I" />
-                    <xul:button flex="1" id="O" label="O" />
-                    <xul:button flex="1" id="P" label="P" />
-                    <xul:button flex="1" id="[" label="[" />
-                    <xul:button flex="1" id="]" label="]" />
+                    <xul:button flex="1" command="buttonpressed" id="TAB" label="TAB" />
+                    <xul:button flex="1" command="buttonpressed" id="Q" label="Q" oncommand="alert('Q button pressed.');" />
+                    <xul:button flex="1" command="buttonpressed" id="W" label="W" />
+                    <xul:button flex="1" command="buttonpressed" id="E" label="E" />
+                    <xul:button flex="1" command="buttonpressed" id="R" label="R" />
+                    <xul:button flex="1" command="buttonpressed" id="T" label="T" />
+                    <xul:button flex="1" command="buttonpressed" id="Y" label="Y" />
+                    <xul:button flex="1" command="buttonpressed" id="U" label="U" />
+                    <xul:button flex="1" command="buttonpressed" id="I" label="I" />
+                    <xul:button flex="1" command="buttonpressed" id="O" label="O" />
+                    <xul:button flex="1" command="buttonpressed" id="P" label="P" />
+                    <xul:button flex="1" command="buttonpressed" id="[" label="[" />
+                    <xul:button flex="1" command="buttonpressed" id="]" label="]" />
                 </xul:hbox>
                 <!-- Line 3: <caps>ASDFGHJKL;'\<enter> -->            
                 <xul:hbox flex="1">
-                    <xul:button flex="1" id="CAPS" label="CAPS" />
-                    <xul:button flex="1" id="A" label="A" />
-                    <xul:button flex="1" id="S" label="S" />
-                    <xul:button flex="1" id="D" label="D" />
-                    <xul:button flex="1" id="F" label="F" />
-                    <xul:button flex="1" id="G" label="G" />
-                    <xul:button flex="1" id="H" label="H" />
-                    <xul:button flex="1" id="J" label="J" />
-                    <xul:button flex="1" id="K" label="K" />
-                    <xul:button flex="1" id="L" label="L" />
-                    <xul:button flex="1" id=";" label=";" />
-                    <xul:button flex="1" id="&apos;" label="&apos;" />
-                    <xul:button flex="1" id="\" label="\" />
-                    <xul:button flex="1" id="ENTER" label="ENTER" />
+                    <xul:button flex="1" command="buttonpressed" id="CAPS" label="CAPS" />
+                    <xul:button flex="1" command="buttonpressed" id="A" label="A" />
+                    <xul:button flex="1" command="buttonpressed" id="S" label="S" />
+                    <xul:button flex="1" command="buttonpressed" id="D" label="D" />
+                    <xul:button flex="1" command="buttonpressed" id="F" label="F" />
+                    <xul:button flex="1" command="buttonpressed" id="G" label="G" />
+                    <xul:button flex="1" command="buttonpressed" id="H" label="H" />
+                    <xul:button flex="1" command="buttonpressed" id="J" label="J" />
+                    <xul:button flex="1" command="buttonpressed" id="K" label="K" />
+                    <xul:button flex="1" command="buttonpressed" id="L" label="L" />
+                    <xul:button flex="1" command="buttonpressed" id=";" label=";" />
+                    <xul:button flex="1" command="buttonpressed" id="&apos;" label="&apos;" />
+                    <xul:button flex="1" command="buttonpressed" id="\" label="\" />
+                    <xul:button flex="1" command="buttonpressed" id="ENTER" label="ENTER" />
                 </xul:hbox>
                 <!-- Line 4: <shift>ZXCVBNM,./<shift> -->
                 <xul:hbox flex="1">
-                    <xul:button flex="1" id="SHIFT" label="SHIFT" />
-                    <xul:button flex="1" id="\" label="\" />
-                    <xul:button flex="1" id="Z" label="Z" />
-                    <xul:button flex="1" id="X" label="X" />
-                    <xul:button flex="1" id="C" label="C" />
-                    <xul:button flex="1" id="V" label="V" />
-                    <xul:button flex="1" id="B" label="B" />
-                    <xul:button flex="1" id="N" label="N" />
-                    <xul:button flex="1" id="M" label="M" />
-                    <xul:button flex="1" id="," label="," />
-                    <xul:button flex="1" id="." label="." />
-                    <xul:button flex="1" id="/" label="/" />
-                    <xul:button flex="1" id="SHIFT" label="SHIFT" />
+                    <xul:button flex="1" command="buttonpressed" id="SHIFTL" label="SHIFT" />
+                    <xul:button flex="1" command="buttonpressed" id="Z" label="Z" />
+                    <xul:button flex="1" command="buttonpressed" id="X" label="X" />
+                    <xul:button flex="1" command="buttonpressed" id="C" label="C" />
+                    <xul:button flex="1" command="buttonpressed" id="V" label="V" />
+                    <xul:button flex="1" command="buttonpressed" id="B" label="B" />
+                    <xul:button flex="1" command="buttonpressed" id="N" label="N" />
+                    <xul:button flex="1" command="buttonpressed" id="M" label="M" />
+                    <xul:button flex="1" command="buttonpressed" id="," label="," />
+                    <xul:button flex="1" command="buttonpressed" id="." label="." />
+                    <xul:button flex="1" command="buttonpressed" id="/" label="/" />
+                    <xul:button flex="1" command="buttonpressed" id="SHIFTR" label="SHIFT" />
                 </xul:hbox>
                 <!-- Line 5: <ctrl> <meta> <alt> <space> <alt> <meta2> <ctrl> <arrows> -->
                 <xul:hbox flex="1">
-                    <xul:button flex="1" id="CTRL" label="CTRL" />
-                    <xul:button flex="1" id="META" label="META" />
-                    <xul:button flex="1" id="ALT" label="ALT" />
-                    <xul:button flex="1" id="SPACE" label="SPACE" />
-                    <xul:button flex="1" id="ALT" label="ALT" />
-                    <xul:button flex="1" id="META2" label="META2" />
-                    <xul:button flex="1" id="CTRL" label="CTRL" />
-                    <xul:button flex="1" id="LEFT" label="LEFT" />
-                    <xul:button flex="1" id="^" label="^" />
-                    <xul:button flex="1" id="v" label="v" />
-                    <xul:button flex="1" id="RIGHT" label="RIGHT" />
+                    <xul:button flex="1" command="buttonpressed" id="CTRLL" label="CTRL" />
+                    <xul:button flex="1" command="buttonpressed" id="META" label="META" />
+                    <xul:button flex="1" command="buttonpressed" id="ALTL" label="ALT" />
+                    <xul:button flex="1" command="buttonpressed" id="SPACE" label="SPACE" />
+                    <xul:button flex="1" command="buttonpressed" id="ALTR" label="ALT" />
+                    <xul:button flex="1" command="buttonpressed" id="META2" label="META2" />
+                    <xul:button flex="1" command="buttonpressed" id="CTRLR" label="CTRL" />
+                    <xul:button flex="1" command="buttonpressed" id="LEFT" label="LEFT" />
+                    <xul:button flex="1" command="buttonpressed" id="^" label="^" />
+                    <xul:button flex="1" command="buttonpressed" id="v" label="v" />
+                    <xul:button flex="1" command="buttonpressed" id="RIGHT" label="RIGHT" />
                 </xul:hbox>
             </xul:vbox>
             <xul:vbox flex="1">
             <!-- Console -->
-                <xul:scrollbox id="keylog">
+                <xul:scrollbox>
+                    <xul:vbox id="keylog">
                     <xul:label>All key operations will be logged here.</xul:label>
+                    </xul:vbox>
                 </xul:scrollbox>         
             </xul:vbox>
         </xul:hbox>

From 64bd8427b81325bf5b14d502a2ff95e1d15d0bd2 Mon Sep 17 00:00:00 2001
From: Tudor Holton <tudor@tudorholton.com>
Date: Sat, 4 Feb 2012 21:30:06 -0500
Subject: [PATCH 08/12] Hmmm.

---
 examples/applications/keyboard/index.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/applications/keyboard/index.html b/examples/applications/keyboard/index.html
index db9bcd6d..af6f6c07 100644
--- a/examples/applications/keyboard/index.html
+++ b/examples/applications/keyboard/index.html
@@ -138,10 +138,11 @@
 	</head>
 	<body bgcolor="silver">
         <script type="application/ample+xml">
-        <xul:commandset xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:aml="http://www.amplesdk.com/ns/aml">
+        <xul:page  xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:aml="http://www.amplesdk.com/ns/aml">
+        <xul:commandset>
             <xul:command id="buttonpressed" oncommand="printKey();" />
         </xul:commandset>
-        <xul:keyset xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:aml="http://www.amplesdk.com/ns/aml" oncommand="press(event.target.getAttribute('key'));">
+        <xul:keyset oncommand="press(event.target.getAttribute('key'));">
                     <xul:key key="F1" />
                     <xul:key key="F2" />
                     <xul:key key="F3" />
@@ -228,7 +229,7 @@
                     <xul:key key="v" />
                     <xul:key key="RIGHT" />
         </xul:keyset>
-        <xul:hbox xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:aml="http://www.amplesdk.com/ns/aml" flex="1">
+        <xul:hbox flex="1">
             <xul:vbox flex="2">
             <!-- Keyboard -->
                 <!-- Line 0: F1-F12 <PrtSc> <Pause> <Insert> <Del> -->
@@ -329,15 +330,14 @@
                     <xul:button flex="1" command="buttonpressed" id="RIGHT" label="RIGHT" />
                 </xul:hbox>
             </xul:vbox>
-            <xul:vbox flex="1">
+            <xul:vbox flex="1" style="overflow: auto;">
             <!-- Console -->
-                <xul:scrollbox>
-                    <xul:vbox id="keylog">
+                <xul:vbox id="keylog" style="overflow: auto;">
                     <xul:label>All key operations will be logged here.</xul:label>
-                    </xul:vbox>
-                </xul:scrollbox>         
+                </xul:vbox>
             </xul:vbox>
         </xul:hbox>
+        </xul:page>
         </script>
 	</body>
 </html>

From 45c3c5e1258173e92784541f33d06f066da35d42 Mon Sep 17 00:00:00 2001
From: Tudor Holton <tudor@tudorholton.com>
Date: Fri, 17 Feb 2012 13:51:03 -0500
Subject: [PATCH 09/12] More work on keyboard.

---
 examples/applications/keyboard/index.html | 37 +++++++++++++++++------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/examples/applications/keyboard/index.html b/examples/applications/keyboard/index.html
index af6f6c07..2a0b0856 100644
--- a/examples/applications/keyboard/index.html
+++ b/examples/applications/keyboard/index.html
@@ -2,10 +2,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title>Ample Keyboard Demo</title>
-		<script type="text/javascript" src="../../../ample/runtime.js"></script>
-		<script type="text/javascript" src="../../../ample/languages/xhtml/xhtml.js"></script>
-		<script type="text/javascript" src="../../../ample/languages/xul/xul.js"></script>
-		<link type="text/ample+css" href="../../../ample/languages/xul/themes/default/style.css" rel="stylesheet"/>
+		<script type="text/javascript" src="../../../../ample/runtime.js"></script>
+		<script type="text/javascript" src="../../../../ample/languages/xhtml/xhtml.js"></script>
+		<script type="text/javascript" src="../../../../ample/languages/xul/xul.js"></script>
+		<link type="text/ample+css" href="../../../../ample/languages/xul/themes/default/style.css" rel="stylesheet"/>
 
 		<style type="text/css">
 			html, body {
@@ -22,7 +22,7 @@
 			}
 		</style>
 
-        <script type="application/javascript">
+        <script type="text/javascript">
             var keymap = {
                 "U+000D":"CR",
                 "U+000E":"SO",
@@ -123,17 +123,36 @@
                 "U+007D":"}"
             };
 
-            function press(key) {
+            function fireMouseEvent(key,event) {
                 var button = ample.getElementById(keymap[key]);
-                button.doCommand();
+                var evt = ample.createEvent("MouseEvents");
+                evt.initMouseEvent(, true, true, window,
+                  0, 0, 0, 0, 0, false, false, false, false, 0, null);
+                if (button) { 
+                    var canceled = !button.dispatchEvent(evt);
+                    if(canceled) {
+                      // A handler called preventDefault
+                      alert("Keypress unexpectedly cancelled.");
+                    }
+                }
+            }
+
+            function pressKey(key) {
+                fireMouseEvent(key,'mousedown');
+                fireMouseEvent(key,'mouseup');
             }
     
             function printKey() {
                 var str = keymap[event.keyIdentifier];
                 //alert(str);
-                var message = '<xul:label xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xi="http://www.w3.org/2001/XInclude">'+ str + ' key pressed.</xul:label>';
+                if (str) str = str + ' key pressed.';
+                else if (event.srcElement.id) str = event.srcElement.id + ' button pressed.';
+                else if (event.keyIdentifier) str = 'Unmapped key:'+event.keyIdentifier;
+                else str = 'Unknown event.';
+                var message = '<xul:label xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xi="http://www.w3.org/2001/XInclude">'+ str + '</xul:label>';
                 ample.query('#keylog').append(message);
             }
+
         </script>
 	</head>
 	<body bgcolor="silver">
@@ -142,7 +161,7 @@
         <xul:commandset>
             <xul:command id="buttonpressed" oncommand="printKey();" />
         </xul:commandset>
-        <xul:keyset oncommand="press(event.target.getAttribute('key'));">
+        <xul:keyset oncommand="pressKey(event.target.getAttribute('key'));">
                     <xul:key key="F1" />
                     <xul:key key="F2" />
                     <xul:key key="F3" />

From c25135b19a6739931245af1a75dd4a85f9bd11ec Mon Sep 17 00:00:00 2001
From: Tudor Holton <tudor@tudorholton.com>
Date: Sat, 1 Dec 2012 09:46:16 +1100
Subject: [PATCH 10/12] Modified mail client example to demo observes
 onbroadcast implementation.

---
 .../mail/client/modules/messages.xml          | 20 +++++++++++-----
 examples/applications/mail/server/messages.js | 23 ++++++++++---------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/examples/applications/mail/client/modules/messages.xml b/examples/applications/mail/client/modules/messages.xml
index 0ed72e96..4521d968 100644
--- a/examples/applications/mail/client/modules/messages.xml
+++ b/examples/applications/mail/client/modules/messages.xml
@@ -2,7 +2,7 @@
 <xul:vbox flex="1" id="asdasd"
 	xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 	<xul:toolbar>
-		<xul:toolbarbutton label="Archieve" observes="brd_message_selected"/>
+		<xul:toolbarbutton label="Archive" observes="brd_message_selected"/>
 		<xul:toolbarbutton label="Report spam" observes="brd_message_selected" />
 		<xul:toolbarbutton label="Delete" observes="brd_message_selected" />
 		<xul:toolbarbutton label="Mark as read" observes="brd_message_selected" />
@@ -42,12 +42,16 @@
 			<xul:spacer width="5" />
 		</xul:hbox>
 	</xul:toolbar>
-	<xul:listbox minheight="100" maxheight="300" height="200" onselect="ample.query('#brd_message_selected').attr('disabled', this.selectedItems.length ? 'false' : 'true');">
+	<xul:listbox minheight="100" maxheight="300" height="200" onselect="
+		ample.query('#brd_message_selected').attr('disabled', this.selectedItems.length ? 'false' : 'true');
+		ample.query('#brd_message_selected').attr('from', this.selectedItems[0].childNodes.item(0).childNodes.item(0).nodeValue);
+		ample.query('#brd_message_selected').attr('header', this.selectedItems[0].childNodes.item(1).childNodes.item(0).nodeValue);
+		">
 		<xul:listhead>
 			<xul:listheader minwidth="100" width="200" label="From"/>
 			<xul:listheader minwidth="300" width="300" label="Subject"/>
 			<xul:listheader minwidth="50" width="100" label="Labels"/>
-			<xul:listheader minwidth="50" width="100" label="Attachements"/>
+			<xul:listheader minwidth="50" width="100" label="Attachments"/>
 			<xul:listheader minwidth="50" width="120" label="Date"/>
 		</xul:listhead>
 		<xul:listbody id="messages"/>
@@ -57,13 +61,17 @@
 		<xul:rows>
 			<xul:row>
 				<xul:label value="From:" />
-				<xul:label />
+				<xul:label id="from">
+					<xul:observes element="brd_message_selected" onbroadcast="this.parentNode.setAttribute('value',this.parentNode.getAttribute('from'));" />
+				</xul:label>
 			</xul:row>
 			<xul:row>
 				<xul:label value="Header:" />
-				<xul:label />
+				<xul:label id="header">
+					<xul:observes element="brd_message_selected" onbroadcast="this.parentNode.setAttribute('value',this.parentNode.getAttribute('header'));" />
+				</xul:label>
 			</xul:row>
 		</xul:rows>
 	</xul:grid>
 	<xul:description style="background-color: white" flex="1" value=" "/>
-</xul:vbox>
\ No newline at end of file
+</xul:vbox>
diff --git a/examples/applications/mail/server/messages.js b/examples/applications/mail/server/messages.js
index 6a9d7454..30e8c080 100644
--- a/examples/applications/mail/server/messages.js
+++ b/examples/applications/mail/server/messages.js
@@ -1,12 +1,13 @@
 [
-	{"id":"1",	"f":"sam@test.com",	"h":"My message", "l":"meeting today",	"a":"", "t":"1990-12-05T12:33"},
-	{"id":"2",	"f":"sam@test.com",	"h":"My message", "l":"meeting today", "a":"", "t":"1990-12-05T12:33"},
-	{"id":"3",	"f":"sam@test.com",	"h":"My message", "l":"meeting today", "a":"", "t":"1990-12-05T12:33"},
-	{"id":"4",	"f":"sam@test.com",	"h":"My message", "l":"meeting today", "a":"", "t":"1990-12-05T12:33"},
-	{"id":"5",	"f":"sam@test.com",	"h":"My message", "l":"meeting today", "a":"", "t":"1990-12-05T12:33"},
-	{"id":"6",	"f":"sam@test.com",	"h":"My message", "l":"meeting today", "a":"", "t":"1990-12-05T12:33"},
-	{"id":"7",	"f":"sam@test.com",	"h":"My message", "l":"meeting today", "a":"", "t":"1990-12-05T12:33"},
-	{"id":"8",	"f":"sam@test.com",	"h":"My message", "l":"meeting today", "a":"", "t":"1990-12-05T12:33"},
-	{"id":"9",	"f":"sam@test.com",	"h":"My message", "l":"meeting today", "a":"", "t":"1990-12-05T12:33"},
-	{"id":"10",	"f":"sam@test.com",	"h":"My message", "l":"meeting today", "a":"", "t":"1990-12-05T12:33"}
-]
\ No newline at end of file
+	{"id":"1",	"f":"lancelot@camelot.com",	"h":"I think you're pretty nice.", "l":"meeting today", "a":"", "t":"1990-12-05T12:33", "c":"Message contents"},
+	{"id":"2",	"f":"lancelot@camelot.com",	"h":"I think you're pretty.", "l":"meeting today", "a":"", "t":"1990-12-05T12:34", "c":"Message contents"},
+	{"id":"3",	"f":"lancelot@camelot.com",	"h":"Please spent some time with me.", "l":"meeting today", "a":"", "t":"1990-12-05T12:35", "c":"Message contents"},
+	{"id":"4",	"f":"lancelot@camelot.com",	"h":"I think I love you.", "l":"meeting today", "a":"", "t":"1990-12-05T12:36", "c":"Message contents"},
+	{"id":"5",	"f":"meliagaunt@camelot.com",	"h":"I know what you did last summer.", "l":"meeting today", "a":"", "t":"1990-12-05T12:37", "c":"Message contents"},
+	{"id":"6",	"f":"lancelot@camelot.com",	"h":"What did you tell Meliagaunt?", "l":"meeting today", "a":"", "t":"1990-12-05T12:38", "c":"Message contents"},
+	{"id":"7",	"f":"lancelot@camelot.com",	"h":"I shall deal with him, my love.", "l":"meeting today", "a":"", "t":"1990-12-05T12:39", "c":"Message contents"},
+	{"id":"8",	"f":"lancelot@camelot.com",	"h":"I hath cleaved him in two.", "l":"meeting today", "a":"", "t":"1990-12-05T12:40", "c":"Message contents"},
+	{"id":"9",	"f":"agravain@camelot.com",	"h":"How could you?", "l":"meeting today", "a":"", "t":"1990-12-05T12:41", "c":"Message contents"},
+	{"id":"10",	"f":"lancelot@camelot.com",	"h":"Which nunnery did you go to?", "l":"meeting today", "a":"", "t":"1990-12-05T12:42", "c":"Message contents"},
+	{"id":"11",	"f":"alfred@tennyson.com",	"h":"Your pain is immortalised.", "l":"meeting today", "a":"", "t":"1990-12-05T12:43", "c":"Message contents"}
+]

From 786b067700f6fc1e1f5064c04843efab53189e2e Mon Sep 17 00:00:00 2001
From: Tudor Holton <tudor@tudorholton.com>
Date: Sat, 1 Dec 2012 09:55:22 +1100
Subject: [PATCH 11/12] Fix branching errors.

---
 ample/languages/xul/elements/box.js       |   1 -
 examples/applications/keyboard/index.html | 362 ----------------------
 2 files changed, 363 deletions(-)
 delete mode 100644 examples/applications/keyboard/index.html

diff --git a/ample/languages/xul/elements/box.js b/ample/languages/xul/elements/box.js
index 889fb10d..5af0ce00 100644
--- a/ample/languages/xul/elements/box.js
+++ b/ample/languages/xul/elements/box.js
@@ -19,7 +19,6 @@ cXULElement_box.prototype.$getTagOpen	= function() {
 	return '<div class="xul-' + this.localName +(this.attributes["class"] ? " " + this.attributes["class"] : "") + '" style="' +
 		(sWidth ? 'width:' + (isNaN(parseInt(sWidth)) ? sWidth : sWidth + 'px;') : '')+
 		(sHeight ? 'height:' + (isNaN(parseInt(sHeight)) ? sHeight : sHeight + 'px;') : '')+
-        this.getAttribute("style")+
 	'">';
 };
 
diff --git a/examples/applications/keyboard/index.html b/examples/applications/keyboard/index.html
deleted file mode 100644
index 2a0b0856..00000000
--- a/examples/applications/keyboard/index.html
+++ /dev/null
@@ -1,362 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<title>Ample Keyboard Demo</title>
-		<script type="text/javascript" src="../../../../ample/runtime.js"></script>
-		<script type="text/javascript" src="../../../../ample/languages/xhtml/xhtml.js"></script>
-		<script type="text/javascript" src="../../../../ample/languages/xul/xul.js"></script>
-		<link type="text/ample+css" href="../../../../ample/languages/xul/themes/default/style.css" rel="stylesheet"/>
-
-		<style type="text/css">
-			html, body {
-				width:	100%;
-				height: 100%;
-				padding:0;
-				margin:	0;
-				overflow:hidden;
-			}
-			body {
-				border: 0;
-				font-family: Arial;
-				font-size: 13px;
-			}
-		</style>
-
-        <script type="text/javascript">
-            var keymap = {
-                "U+000D":"CR",
-                "U+000E":"SO",
-                "U+000F":"SI",
-                "U+001B":"ESC",
-                "U+0020":"SP",
-                "U+0021":"!",
-                "U+0022":"\"",
-                "U+0023":"#",
-                "U+0024":"$",
-                "U+0025":"%",
-                "U+0026":"&",
-                "U+0027":"'",
-                "U+0028":"(",
-                "U+0029":")",
-                "U+002A":"*",
-                "U+002B":"0",
-                "U+002C":",",
-                "U+002D":"-",
-                "U+002E":".",
-                "U+0030":"0",
-                "U+0031":"1",
-                "U+0032":"2",
-                "U+0033":"3",
-                "U+0034":"4",
-                "U+0035":"5",
-                "U+0036":"6",
-                "U+0037":"7",
-                "U+0038":"8",
-                "U+0039":"9",
-                "U+003A":":",
-                "U+003B":";",
-                "U+003C":"<",
-                "U+003D":"=",
-                "U+003E":">",
-                "U+003F":"?",
-                "U+0040":"@",
-                "U+0041":"A",
-                "U+0042":"B",
-                "U+0043":"C",
-                "U+0044":"D",
-                "U+0045":"E",
-                "U+0046":"F",
-                "U+0047":"G",
-                "U+0048":"H",
-                "U+0049":"I",
-                "U+004A":"J",
-                "U+004B":"K",
-                "U+004C":"L",
-                "U+004D":"M",
-                "U+004E":"N",
-                "U+004F":"O",
-                "U+0050":"P",
-                "U+0051":"Q",
-                "U+0052":"R",
-                "U+0053":"S",
-                "U+0054":"T",
-                "U+0055":"U",
-                "U+0056":"V",
-                "U+0057":"W",
-                "U+0058":"X",
-                "U+0059":"Y",
-                "U+005A":"Z",
-                "U+005B":"[",
-                "U+005C":"\\",
-                "U+005D":"]",
-                "U+005E":"^",
-                "U+005F":"_",
-                "U+0060":"`",
-                "U+0061":"a",
-                "U+0062":"b",
-                "U+0063":"c",
-                "U+0064":"d",
-                "U+0065":"e",
-                "U+0066":"f",
-                "U+0067":"g",
-                "U+0068":"h",
-                "U+0069":"i",
-                "U+006A":"j",
-                "U+006B":"k",
-                "U+006C":"l",
-                "U+006D":"m",
-                "U+006E":"n",
-                "U+006F":"o",
-                "U+0070":"p",
-                "U+0071":"q",
-                "U+0072":"r",
-                "U+0073":"s",
-                "U+0074":"t",
-                "U+0075":"u",
-                "U+0076":"v",
-                "U+0077":"w",
-                "U+0078":"x",
-                "U+0079":"y",
-                "U+007A":"z",
-                "U+007B":"{",
-                "U+007C":"|",
-                "U+007D":"}"
-            };
-
-            function fireMouseEvent(key,event) {
-                var button = ample.getElementById(keymap[key]);
-                var evt = ample.createEvent("MouseEvents");
-                evt.initMouseEvent(, true, true, window,
-                  0, 0, 0, 0, 0, false, false, false, false, 0, null);
-                if (button) { 
-                    var canceled = !button.dispatchEvent(evt);
-                    if(canceled) {
-                      // A handler called preventDefault
-                      alert("Keypress unexpectedly cancelled.");
-                    }
-                }
-            }
-
-            function pressKey(key) {
-                fireMouseEvent(key,'mousedown');
-                fireMouseEvent(key,'mouseup');
-            }
-    
-            function printKey() {
-                var str = keymap[event.keyIdentifier];
-                //alert(str);
-                if (str) str = str + ' key pressed.';
-                else if (event.srcElement.id) str = event.srcElement.id + ' button pressed.';
-                else if (event.keyIdentifier) str = 'Unmapped key:'+event.keyIdentifier;
-                else str = 'Unknown event.';
-                var message = '<xul:label xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xi="http://www.w3.org/2001/XInclude">'+ str + '</xul:label>';
-                ample.query('#keylog').append(message);
-            }
-
-        </script>
-	</head>
-	<body bgcolor="silver">
-        <script type="application/ample+xml">
-        <xul:page  xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:aml="http://www.amplesdk.com/ns/aml">
-        <xul:commandset>
-            <xul:command id="buttonpressed" oncommand="printKey();" />
-        </xul:commandset>
-        <xul:keyset oncommand="pressKey(event.target.getAttribute('key'));">
-                    <xul:key key="F1" />
-                    <xul:key key="F2" />
-                    <xul:key key="F3" />
-                    <xul:key key="F4" />
-                    <xul:key key="F5" />
-                    <xul:key key="F6" />
-                    <xul:key key="F7" />
-                    <xul:key key="F8" />
-                    <xul:key key="F9" />
-                    <xul:key key="F10" />
-                    <xul:key key="F11" />
-                    <xul:key key="F12" />
-                    <xul:key key="PrtSc" />
-                    <xul:key key="Ins" />
-                    <xul:key key="Del" />
-                <!-- Line 1: `1234567890-=<bs> -->
-                    <xul:key key="`" />
-                    <xul:key key="U+0031" />
-                    <xul:key key="U+0032" />
-                    <xul:key key="U+0033" />
-                    <xul:key key="U+0034" />
-                    <xul:key key="U+0035" />
-                    <xul:key key="U+0036" />
-                    <xul:key key="U+0037" />
-                    <xul:key key="U+0038" />
-                    <xul:key key="U+0039" />
-                    <xul:key key="U+0030" />
-                    <xul:key key="-" />
-                    <xul:key key="=" />
-                    <xul:key key="BKSP" />
-                <!-- Line 2: <tab>QWERTYUIOOP[] -->            
-                    <xul:key key="TAB" />
-                    <xul:key key="U+0051" />
-                    <xul:key key="U+0057" />
-                    <xul:key key="U+0045" />
-                    <xul:key key="U+0052" />
-                    <xul:key key="U+0054" />
-                    <xul:key key="U+0059" />
-                    <xul:key key="U+0055" />
-                    <xul:key key="U+0049" />
-                    <xul:key key="U+004F" />
-                    <xul:key key="U+0050" />
-                    <xul:key key="U+005B" />
-                    <xul:key key="U+005D" />
-                <!-- Line 3: <caps>ASDFGHJKL;'\<enter> -->            
-                    <xul:key key="CAPS" />
-                    <xul:key key="U+0041" />
-                    <xul:key key="U+0053" />
-                    <xul:key key="U+0044" />
-                    <xul:key key="U+0046" />
-                    <xul:key key="U+0047" />
-                    <xul:key key="U+0048" />
-                    <xul:key key="U+004A" />
-                    <xul:key key="U+004B" />
-                    <xul:key key="U+004C" />
-                    <xul:key key=";" />
-                    <xul:key key="&apos;" />
-                    <xul:key key="\" />
-                    <xul:key key="ENTER" />
-                <!-- Line 4: <shift>ZXCVBNM,./<shift> -->
-                    <xul:key key="SHIFT" />
-                    <xul:key key="\" />
-                    <xul:key key="U+005A" />
-                    <xul:key key="U+0058" />
-                    <xul:key key="U+0043" />
-                    <xul:key key="U+0056" />
-                    <xul:key key="U+0042" />
-                    <xul:key key="U+004E" />
-                    <xul:key key="U+004D" />
-                    <xul:key key="," />
-                    <xul:key key="." />
-                    <xul:key key="/" />
-                    <xul:key key="SHIFT" />
-                <!-- Line 5: <ctrl> <meta> <alt> <space> <alt> <meta2> <ctrl> <arrows> -->
-                    <xul:key key="CTRL" />
-                    <xul:key key="META" />
-                    <xul:key key="ALT" />
-                    <xul:key key="SPACE" />
-                    <xul:key key="ALT" />
-                    <xul:key key="META2" />
-                    <xul:key key="CTRL" />
-                    <xul:key key="LEFT" />
-                    <xul:key key="^" />
-                    <xul:key key="v" />
-                    <xul:key key="RIGHT" />
-        </xul:keyset>
-        <xul:hbox flex="1">
-            <xul:vbox flex="2">
-            <!-- Keyboard -->
-                <!-- Line 0: F1-F12 <PrtSc> <Pause> <Insert> <Del> -->
-                <xul:hbox flex="1">
-                    <xul:button flex="1" command="buttonpressed" id="F1" label="F1" />
-                    <xul:button flex="1" command="buttonpressed" id="F2" label="F2" />
-                    <xul:button flex="1" command="buttonpressed" id="F3" label="F3" />
-                    <xul:button flex="1" command="buttonpressed" id="F4" label="F4" />
-                    <xul:button flex="1" command="buttonpressed" id="F5" label="F5" />
-                    <xul:button flex="1" command="buttonpressed" id="F6" label="F6" />
-                    <xul:button flex="1" command="buttonpressed" id="F7" label="F7" />
-                    <xul:button flex="1" command="buttonpressed" id="F8" label="F8" />
-                    <xul:button flex="1" command="buttonpressed" id="F9" label="F9" />
-                    <xul:button flex="1" command="buttonpressed" id="F10" label="F10" />
-                    <xul:button flex="1" command="buttonpressed" id="F11" label="F11" />
-                    <xul:button flex="1" command="buttonpressed" id="F12" label="F12" />
-                    <xul:button flex="1" command="buttonpressed" id="PrtSc" label="PrtSc" />
-                    <xul:button flex="1" command="buttonpressed" id="Ins" label="Ins" />
-                    <xul:button flex="1" command="buttonpressed" id="Del" label="Del" />
-                </xul:hbox>
-                <!-- Line 1: `1234567890-=<bs> -->
-                <xul:hbox flex="1">
-                    <xul:button flex="1" command="buttonpressed" id="`" label="`" />
-                    <xul:button flex="1" command="buttonpressed" id="1" label="1" />
-                    <xul:button flex="1" command="buttonpressed" id="2" label="2" />
-                    <xul:button flex="1" command="buttonpressed" id="3" label="3" />
-                    <xul:button flex="1" command="buttonpressed" id="4" label="4" />
-                    <xul:button flex="1" command="buttonpressed" id="5" label="5" />
-                    <xul:button flex="1" command="buttonpressed" id="6" label="6" />
-                    <xul:button flex="1" command="buttonpressed" id="7" label="7" />
-                    <xul:button flex="1" command="buttonpressed" id="8" label="8" />
-                    <xul:button flex="1" command="buttonpressed" id="9" label="9" />
-                    <xul:button flex="1" command="buttonpressed" id="0" label="0" />
-                    <xul:button flex="1" command="buttonpressed" id="-" label="-" />
-                    <xul:button flex="1" command="buttonpressed" id="=" label="=" />
-                    <xul:button flex="1" command="buttonpressed" id="BKSP" label="BKSP" />
-                </xul:hbox>
-                <!-- Line 2: <tab>QWERTYUIOOP[] -->            
-                <xul:hbox flex="1">
-                    <xul:button flex="1" command="buttonpressed" id="TAB" label="TAB" />
-                    <xul:button flex="1" command="buttonpressed" id="Q" label="Q" oncommand="alert('Q button pressed.');" />
-                    <xul:button flex="1" command="buttonpressed" id="W" label="W" />
-                    <xul:button flex="1" command="buttonpressed" id="E" label="E" />
-                    <xul:button flex="1" command="buttonpressed" id="R" label="R" />
-                    <xul:button flex="1" command="buttonpressed" id="T" label="T" />
-                    <xul:button flex="1" command="buttonpressed" id="Y" label="Y" />
-                    <xul:button flex="1" command="buttonpressed" id="U" label="U" />
-                    <xul:button flex="1" command="buttonpressed" id="I" label="I" />
-                    <xul:button flex="1" command="buttonpressed" id="O" label="O" />
-                    <xul:button flex="1" command="buttonpressed" id="P" label="P" />
-                    <xul:button flex="1" command="buttonpressed" id="[" label="[" />
-                    <xul:button flex="1" command="buttonpressed" id="]" label="]" />
-                </xul:hbox>
-                <!-- Line 3: <caps>ASDFGHJKL;'\<enter> -->            
-                <xul:hbox flex="1">
-                    <xul:button flex="1" command="buttonpressed" id="CAPS" label="CAPS" />
-                    <xul:button flex="1" command="buttonpressed" id="A" label="A" />
-                    <xul:button flex="1" command="buttonpressed" id="S" label="S" />
-                    <xul:button flex="1" command="buttonpressed" id="D" label="D" />
-                    <xul:button flex="1" command="buttonpressed" id="F" label="F" />
-                    <xul:button flex="1" command="buttonpressed" id="G" label="G" />
-                    <xul:button flex="1" command="buttonpressed" id="H" label="H" />
-                    <xul:button flex="1" command="buttonpressed" id="J" label="J" />
-                    <xul:button flex="1" command="buttonpressed" id="K" label="K" />
-                    <xul:button flex="1" command="buttonpressed" id="L" label="L" />
-                    <xul:button flex="1" command="buttonpressed" id=";" label=";" />
-                    <xul:button flex="1" command="buttonpressed" id="&apos;" label="&apos;" />
-                    <xul:button flex="1" command="buttonpressed" id="\" label="\" />
-                    <xul:button flex="1" command="buttonpressed" id="ENTER" label="ENTER" />
-                </xul:hbox>
-                <!-- Line 4: <shift>ZXCVBNM,./<shift> -->
-                <xul:hbox flex="1">
-                    <xul:button flex="1" command="buttonpressed" id="SHIFTL" label="SHIFT" />
-                    <xul:button flex="1" command="buttonpressed" id="Z" label="Z" />
-                    <xul:button flex="1" command="buttonpressed" id="X" label="X" />
-                    <xul:button flex="1" command="buttonpressed" id="C" label="C" />
-                    <xul:button flex="1" command="buttonpressed" id="V" label="V" />
-                    <xul:button flex="1" command="buttonpressed" id="B" label="B" />
-                    <xul:button flex="1" command="buttonpressed" id="N" label="N" />
-                    <xul:button flex="1" command="buttonpressed" id="M" label="M" />
-                    <xul:button flex="1" command="buttonpressed" id="," label="," />
-                    <xul:button flex="1" command="buttonpressed" id="." label="." />
-                    <xul:button flex="1" command="buttonpressed" id="/" label="/" />
-                    <xul:button flex="1" command="buttonpressed" id="SHIFTR" label="SHIFT" />
-                </xul:hbox>
-                <!-- Line 5: <ctrl> <meta> <alt> <space> <alt> <meta2> <ctrl> <arrows> -->
-                <xul:hbox flex="1">
-                    <xul:button flex="1" command="buttonpressed" id="CTRLL" label="CTRL" />
-                    <xul:button flex="1" command="buttonpressed" id="META" label="META" />
-                    <xul:button flex="1" command="buttonpressed" id="ALTL" label="ALT" />
-                    <xul:button flex="1" command="buttonpressed" id="SPACE" label="SPACE" />
-                    <xul:button flex="1" command="buttonpressed" id="ALTR" label="ALT" />
-                    <xul:button flex="1" command="buttonpressed" id="META2" label="META2" />
-                    <xul:button flex="1" command="buttonpressed" id="CTRLR" label="CTRL" />
-                    <xul:button flex="1" command="buttonpressed" id="LEFT" label="LEFT" />
-                    <xul:button flex="1" command="buttonpressed" id="^" label="^" />
-                    <xul:button flex="1" command="buttonpressed" id="v" label="v" />
-                    <xul:button flex="1" command="buttonpressed" id="RIGHT" label="RIGHT" />
-                </xul:hbox>
-            </xul:vbox>
-            <xul:vbox flex="1" style="overflow: auto;">
-            <!-- Console -->
-                <xul:vbox id="keylog" style="overflow: auto;">
-                    <xul:label>All key operations will be logged here.</xul:label>
-                </xul:vbox>
-            </xul:vbox>
-        </xul:hbox>
-        </xul:page>
-        </script>
-	</body>
-</html>

From d1925c6eaed8aae4e1d48bc82d8015712808794b Mon Sep 17 00:00:00 2001
From: h6w <tudor@tudorholton.com>
Date: Wed, 28 Jan 2015 10:45:10 +1100
Subject: [PATCH 12/12] Update messages.js

Typo
---
 examples/applications/mail/server/messages.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/applications/mail/server/messages.js b/examples/applications/mail/server/messages.js
index 30e8c080..c958753a 100644
--- a/examples/applications/mail/server/messages.js
+++ b/examples/applications/mail/server/messages.js
@@ -1,7 +1,7 @@
 [
 	{"id":"1",	"f":"lancelot@camelot.com",	"h":"I think you're pretty nice.", "l":"meeting today", "a":"", "t":"1990-12-05T12:33", "c":"Message contents"},
 	{"id":"2",	"f":"lancelot@camelot.com",	"h":"I think you're pretty.", "l":"meeting today", "a":"", "t":"1990-12-05T12:34", "c":"Message contents"},
-	{"id":"3",	"f":"lancelot@camelot.com",	"h":"Please spent some time with me.", "l":"meeting today", "a":"", "t":"1990-12-05T12:35", "c":"Message contents"},
+	{"id":"3",	"f":"lancelot@camelot.com",	"h":"Please spend some time with me.", "l":"meeting today", "a":"", "t":"1990-12-05T12:35", "c":"Message contents"},
 	{"id":"4",	"f":"lancelot@camelot.com",	"h":"I think I love you.", "l":"meeting today", "a":"", "t":"1990-12-05T12:36", "c":"Message contents"},
 	{"id":"5",	"f":"meliagaunt@camelot.com",	"h":"I know what you did last summer.", "l":"meeting today", "a":"", "t":"1990-12-05T12:37", "c":"Message contents"},
 	{"id":"6",	"f":"lancelot@camelot.com",	"h":"What did you tell Meliagaunt?", "l":"meeting today", "a":"", "t":"1990-12-05T12:38", "c":"Message contents"},