diff options
| -rw-r--r-- | web/nms.gathering.org/index.html | 4 | ||||
| -rw-r--r-- | web/nms.gathering.org/js/nms.js | 38 |
2 files changed, 38 insertions, 4 deletions
diff --git a/web/nms.gathering.org/index.html b/web/nms.gathering.org/index.html index db1acfa..02ae93c 100644 --- a/web/nms.gathering.org/index.html +++ b/web/nms.gathering.org/index.html @@ -125,6 +125,10 @@ </tr> <tr> <td>?</td> + <td>Toggle this help window</td> + </tr> + <tr> + <td>-</td> <td>Toggle navigation bar</td> </tr> <tr> diff --git a/web/nms.gathering.org/js/nms.js b/web/nms.gathering.org/js/nms.js index 8f93367..c1f8da2 100644 --- a/web/nms.gathering.org/js/nms.js +++ b/web/nms.gathering.org/js/nms.js @@ -29,7 +29,7 @@ var nms = { 'menuShowing' ], keyBindings:{ - '?':toggleMenu, + '-':toggleMenu, 'n':toggleNightMode, '1':setMapModeFromN, '2':setMapModeFromN, @@ -43,7 +43,9 @@ var nms = { 'k':moveTimeFromKey, 'l':moveTimeFromKey, 'p':moveTimeFromKey, - 'r':moveTimeFromKey + 'r':moveTimeFromKey, + 'Escape':hideWindow, + '?':toggleHelp }, /* * Playback controllers and variables @@ -503,6 +505,13 @@ function toggleMenu() setMenu(); saveSettings(); } +function hideWindow(e,key) +{ + nmsInfoBox.hide(); +} +function toggleHelp(e,key) { + toggleLayer('aboutKeybindings'); +} function setMapModeFromN(e,key) { @@ -563,7 +572,26 @@ function keyPressed(e) if (e.target.nodeName == "INPUT") { return false; } - var key = String.fromCharCode(e.keyCode); + if(e.key) { + var key = e.key; + } else { + var key = e.keyCode; + switch(key) { + case 187: + key = '?'; + break; + case 189: + key = '-'; + break; + case 27: + key = 'Escape'; + break; + default: + key = String.fromCharCode(key); + key = key.toLowerCase(); + break; + } + } if (nms.keyBindings[key]) return nms.keyBindings[key](e,key); if (nms.keyBindings['default']) @@ -574,7 +602,9 @@ function keyPressed(e) function setupKeyhandler() { var b = document.getElementsByTagName("body")[0]; - b.onkeypress = function(e){keyPressed(e);}; + $( "body" ).keyup(function(e) { + keyPressed(e); + }); } |