Merge branch 'master' of github.com:whscullin/apple2js

This commit is contained in:
Will Scullin 2019-01-09 00:52:21 -08:00
commit 5ebb5b0615
No known key found for this signature in database
GPG Key ID: 9092A5C0A673416B

View File

@ -736,6 +736,7 @@ function _keydown(evt) {
} }
if (evt.keyCode === 112) { // F1 - Reset if (evt.keyCode === 112) { // F1 - Reset
cpu.reset(); cpu.reset();
evt.preventDefault(); // prevent launching help
} else if (evt.keyCode === 113) { // F2 - Full Screen } else if (evt.keyCode === 113) { // F2 - Full Screen
var elem = document.getElementById('screen'); var elem = document.getElementById('screen');
if (document.webkitCancelFullScreen) { if (document.webkitCancelFullScreen) {