Merge branch 'next-release'

This commit is contained in:
Jeff Parsons 2016-12-08 21:36:40 -08:00
commit 18b9ed7529
2 changed files with 22 additions and 16 deletions

View file

@ -242,6 +242,11 @@ SerialPortPDP11.prototype.setBinding = function(sType, sBinding, control, sValue
* brilliant (or rather, the opposite of brilliant), but that's life.
*/
event = event || window.event;
/*
* Not sure why COMMAND-key combinations are coming through here (on Safari at least),
* but in any case, let's make sure we don't act on them.
*/
if (!event.metaKey) {
var bASCII = event.which || event.keyCode;
/*
* Perform the same remapping of ALT-ENTER (to LINE-FEED) that our VT100 emulation performs,
@ -261,6 +266,7 @@ SerialPortPDP11.prototype.setBinding = function(sType, sBinding, control, sValue
* on top of whatever the machine is echoing back, resulting in double characters.
*/
if (event.preventDefault) event.preventDefault();
}
return true;
};

File diff suppressed because one or more lines are too long