Consistenly report ESC key as "Escape", not "Esc".

Fixes #439.
ibm-js · Mar 10, 2016 · fc33d98 · fc33d98
1 parent 1a3b5b6
commit fc33d98
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/HasDropDown.js b/HasDropDown.js
@@ -379,7 +379,7 @@ define([
 					return;
 				}
 			}
-			if (dropDown && this.opened && e.key === "Esc") {
+			if (dropDown && this.opened && e.key === "Escape") {
 				this.closeDropDown();
 				e.stopPropagation();
 				e.preventDefault();

diff --git a/on.js b/on.js
@@ -28,7 +28,7 @@ define(function () {
 					"U+0020": "Spacebar",
 					"U+0008": "Backspace",
 					"U+0009": "Tab",
-					"U+001B": "Esc",
+					"U+001B": "Escape",
 
 					// fix for FF 34
 					" ": "Spacebar",
@@ -40,6 +40,7 @@ define(function () {
 					"Right": "ArrowRight",
 					"Up": "ArrowUp",
 					"Del": "Delete",
+					"Esc": "Escape",
 
 					// fix for Android 4.2
 					"U+00007F": "Backspace"

diff --git a/popup.js b/popup.js
@@ -336,7 +336,7 @@ define([
 			// provide default escape and tab key handling
 			// (this will work for any widget, not just menu)
 			var onKeyDown = function (evt) {
-				if ((evt.key === "Esc" || evt.key === "Tab") && args.onCancel) {
+				if ((evt.key === "Escape" || evt.key === "Tab") && args.onCancel) {
 					evt.stopPropagation();
 					evt.preventDefault();
 					args.onCancel();

diff --git a/tests/functional/on.js b/tests/functional/on.js
@@ -54,7 +54,7 @@ define([
 					})
 					.pressKeys(keys.ESCAPE)
 					.execute("return keydown_log.value;").then(function (log) {
-						assert.strictEqual(log, "Esc");
+						assert.strictEqual(log, "Escape");
 					})
 					.pressKeys(" ")
 					.execute("return keydown_log.value;").then(function (log) {