Preparing web server for update to v1.15.4

This commit is contained in:
Jeff Parsons 2014-10-10 16:36:50 -07:00 committed by jeffpar
commit 1d9a5ee0df
39 changed files with 7519 additions and 1387 deletions

View file

@ -1050,7 +1050,7 @@ Keyboard.prototype.keyEvent = function(event, fDown)
/*
* HACK for simulating Ctrl-Break using Ctrl-Del (Mac) / Ctrl-Backspace (Windows)
*/
if (keyCode == Keyboard.KEYCODE.DELETE && (this.bitsShift & Keyboard.STATE.CTRL)) {
if (keyCode == Keyboard.KEYCODE.DELETE && (this.bitsShift & (Keyboard.STATE.CTRL|Keyboard.STATE.ALT)) == Keyboard.STATE.CTRL) {
keyCode = Keyboard.CHARCODE.CTRLBREAK;
}
/*