diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-03-10 10:12:32 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-03-10 10:12:32 -0700 |
| commit | 8b67982bf0af32ffa48c6cf6355d7d86cdb0817d (patch) | |
| tree | 17ed84e88a03888fcd42e85b4f5b40b4b8c88e93 | |
| parent | 86587901bb89c628130e77a7604a5a85c8c8f575 (diff) | |
| parent | 99a8cf5b4f6ed6e269408ae3b354829ed6e15e06 (diff) | |
Merge branch 'patch-1' of github.com:ddiproietto/emscripten into incoming
Conflicts:
AUTHORS
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | src/library_glfw.js | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -131,4 +131,5 @@ a license to everyone to use it as detailed in LICENSE.) * Bernhard Fey <e-male@web.de> * Dave Nicponski <dave.nicponski@gmail.com> * Jonathan Jarri <noxalus@gmail.com> +* Daniele Di Proietto <daniele.di.proietto@gmail.com> diff --git a/src/library_glfw.js b/src/library_glfw.js index b54205ad..e5782900 100644 --- a/src/library_glfw.js +++ b/src/library_glfw.js @@ -51,7 +51,7 @@ var LibraryGLFW = { DOMToGLFWKeyCode: function(keycode) { switch (keycode) { case 0x09: return 295 ; //DOM_VK_TAB -> GLFW_KEY_TAB - case 0x1B: return 255 ; //DOM_VK_ESCAPE -> GLFW_KEY_ESC + case 0x1B: return 257 ; //DOM_VK_ESCAPE -> GLFW_KEY_ESC case 0x6A: return 313 ; //DOM_VK_MULTIPLY -> GLFW_KEY_KP_MULTIPLY case 0x6B: return 315 ; //DOM_VK_ADD -> GLFW_KEY_KP_ADD case 0x6D: return 314 ; //DOM_VK_SUBTRACT -> GLFW_KEY_KP_SUBTRACT |