From 82815e5b85510867f14d9f265952280eb55f43f0 Mon Sep 17 00:00:00 2001 From: Will Scullin Date: Thu, 21 Mar 2019 20:39:48 -0700 Subject: [PATCH] Fix hamfisted jquery -> html5 translation. --- .eslintignore | 1 + js/main2.js | 6 +++--- js/main2e.js | 11 ++++++----- package.json | 3 ++- 4 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 .eslintignore diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..17a09ef --- /dev/null +++ b/.eslintignore @@ -0,0 +1 @@ +json/disks/index.js diff --git a/js/main2.js b/js/main2.js index 6b8806b..41c831f 100644 --- a/js/main2.js +++ b/js/main2.js @@ -765,11 +765,11 @@ function _keydown(evt) { var elem = document.getElementById('screen'); if (evt.shiftKey) { // Full window, but not full screen document.querySelector('#display').classList.toggle('zoomwindow'); - document.querySelector('#display > div').classList.toggle('overscan', 'flexbox-centering'); + document.querySelector('#display > div').classList.toggle('overscan'); + document.querySelector('#display > div').classList.toggle('flexbox-centering'); document.querySelector('#screen').classList.toggle('maxhw'); document.querySelector('#header').classList.toggle('hidden'); - document.querySelector('.inset').classList.toggle('hidden'); - document.querySelector('#reset').classList.toggle('hidden'); + document.querySelectorAll('.inset').forEach((el) => el.classList.toggle('hidden')); } else if (document.webkitCancelFullScreen) { if (document.webkitIsFullScreen) { document.webkitCancelFullScreen(); diff --git a/js/main2e.js b/js/main2e.js index 4af9f3c..53f49ef 100644 --- a/js/main2e.js +++ b/js/main2e.js @@ -479,9 +479,9 @@ function run(pc) { } else { cpu.stepCycles(step); } - if (vm.blit()) { - renderedFrames++; - } + if (vm.blit()) { + renderedFrames++; + } io.tick(); } @@ -727,10 +727,11 @@ function _keydown(evt) { var elem = document.getElementById('screen'); if (evt.shiftKey) { // Full window, but not full screen document.querySelector('#display').classList.toggle('zoomwindow'); - document.querySelector('#display > div').classList.toggle('overscan', 'flexbox-centering'); + document.querySelector('#display > div').classList.toggle('overscan'); + document.querySelector('#display > div').classList.toggle('flexbox-centering'); document.querySelector('#screen').classList.toggle('maxhw'); document.querySelector('#header').classList.toggle('hidden'); - document.querySelector('.inset').classList.toggle('hidden'); + document.querySelectorAll('.inset').forEach((el) => el.classList.toggle('hidden')); document.querySelector('#reset').classList.toggle('hidden'); } else if (document.webkitCancelFullScreen) { if (document.webkitIsFullScreen) { diff --git a/package.json b/package.json index d5e85aa..2f12eda 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "build": "webpack --mode=production", "dev": "webpack-dev-server", "index": "scripts/index.pl > json/disks/index.js", - "lint": "eslint js" + "lint": "eslint js", + "start": "webpack-dev-server" }, "repository": { "type": "git",