From 3f141c63b1a270c2426f254c7dd96b647ba64051 Mon Sep 17 00:00:00 2001 From: Will Scullin Date: Thu, 5 Sep 2019 12:01:48 -0700 Subject: [PATCH 1/4] Remove jQuery and jQuery UI. --- .editorconfig | 3 + .eslintrc.json | 1 - apple1js.html | 158 +++--- css/apple1.css | 123 ++++- .../images/ui-anim_basic_16x16.gif | Bin 1553 -> 0 bytes .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 180 -> 0 bytes .../images/ui-bg_glass_15_5f391b_1x400.png | Bin 129 -> 0 bytes .../ui-bg_gloss-wave_20_1c160d_500x100.png | Bin 1854 -> 0 bytes .../ui-bg_gloss-wave_25_453326_500x100.png | Bin 2504 -> 0 bytes .../ui-bg_gloss-wave_30_44372c_500x100.png | Bin 3406 -> 0 bytes .../ui-bg_highlight-soft_20_201913_1x100.png | Bin 118 -> 0 bytes .../ui-bg_highlight-soft_20_9c947c_1x100.png | Bin 153 -> 0 bytes .../ui-bg_inset-soft_10_201913_1x100.png | Bin 106 -> 0 bytes .../images/ui-icons_222222_256x240.png | Bin 4369 -> 0 bytes .../images/ui-icons_e3ddc9_256x240.png | Bin 4369 -> 0 bytes .../images/ui-icons_f1fd86_256x240.png | Bin 5355 -> 0 bytes .../images/ui-icons_ffffff_256x240.png | Bin 4369 -> 0 bytes css/custom-choc/jquery-ui-1.8.all.css | 489 ------------------ js/apple1.js | 153 +++--- js/ui/keyboard.js | 88 ++-- js/util.js | 2 +- 21 files changed, 340 insertions(+), 677 deletions(-) delete mode 100755 css/custom-choc/images/ui-anim_basic_16x16.gif delete mode 100755 css/custom-choc/images/ui-bg_flat_0_aaaaaa_40x100.png delete mode 100755 css/custom-choc/images/ui-bg_glass_15_5f391b_1x400.png delete mode 100755 css/custom-choc/images/ui-bg_gloss-wave_20_1c160d_500x100.png delete mode 100755 css/custom-choc/images/ui-bg_gloss-wave_25_453326_500x100.png delete mode 100755 css/custom-choc/images/ui-bg_gloss-wave_30_44372c_500x100.png delete mode 100755 css/custom-choc/images/ui-bg_highlight-soft_20_201913_1x100.png delete mode 100755 css/custom-choc/images/ui-bg_highlight-soft_20_9c947c_1x100.png delete mode 100755 css/custom-choc/images/ui-bg_inset-soft_10_201913_1x100.png delete mode 100755 css/custom-choc/images/ui-icons_222222_256x240.png delete mode 100755 css/custom-choc/images/ui-icons_e3ddc9_256x240.png delete mode 100755 css/custom-choc/images/ui-icons_f1fd86_256x240.png delete mode 100755 css/custom-choc/images/ui-icons_ffffff_256x240.png delete mode 100755 css/custom-choc/jquery-ui-1.8.all.css diff --git a/.editorconfig b/.editorconfig index 07dad77..011b4cc 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,6 +10,9 @@ trim_trailing_whitespace = true [*.js] indent_size = 4 +[*.html] +indent_size = 2 + [*.md] trim_trailing_whitespace = true diff --git a/.eslintrc.json b/.eslintrc.json index d566b2f..e433d72 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -20,7 +20,6 @@ "env": { "builtin": true, "browser": true, - "jquery": true, "es6": true }, "parserOptions": { diff --git a/apple1js.html b/apple1js.html index c2c972b..f26db53 100644 --- a/apple1js.html +++ b/apple1js.html @@ -1,4 +1,4 @@ - + diff --git a/js/apple1.js b/js/apple1.js index b9a3d20..853c594 100644 --- a/js/apple1.js +++ b/js/apple1.js @@ -99,17 +99,13 @@ export function doLoadLocal() { } } aci.buffer = buf; - MicroModal.close('local'); + MicroModal.close('local-modal'); }); }; fileReader.readAsArrayBuffer(file); } } -export function openLoadLocal() { - MicroModal.open('local'); -} - function updateKHz() { var now = Date.now(); var ms = now - startTime; @@ -317,7 +313,7 @@ export function openOptions() { export function openLoadText(event) { if (event && event.altKey) { - MicroModal.show('local'); + MicroModal.show('local-modal'); } else { MicroModal.show('input-modal'); } From 6858c298cf788ef8e9bddf007714b6f0a509a0fe Mon Sep 17 00:00:00 2001 From: Will Scullin Date: Thu, 5 Sep 2019 21:24:06 -0700 Subject: [PATCH 3/4] Fix padding. --- css/apple1.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/apple1.css b/css/apple1.css index b6b43d4..134d272 100644 --- a/css/apple1.css +++ b/css/apple1.css @@ -337,8 +337,8 @@ canvas { font-family: Courier, fixed; } -#text_input .controls { - padding-bottom: 5px; +#input-modal .controls { + padding-bottom: 10px; } #player { From d189fe98d551f21a98367d40979041cebca44518 Mon Sep 17 00:00:00 2001 From: Will Scullin Date: Thu, 5 Sep 2019 21:42:40 -0700 Subject: [PATCH 4/4] Fix loading audio files. --- js/apple1.js | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/js/apple1.js b/js/apple1.js index 853c594..fc17635 100644 --- a/js/apple1.js +++ b/js/apple1.js @@ -74,33 +74,42 @@ aci.setData(window.tapes['Microchess'].tracks); // Audio Buffer Source var context; -if (typeof window.webkitAudioContext != 'undefined') { - context = new window.webkitAudioContext(); +if (typeof window.webkitAudioContext !== 'undefined') { + context = window.webkitAudioContext; +} else if (typeof window.AudioContext !== 'undefined') { + context = new window.AudioContext(); } export function doLoadLocal() { + context.resume(); var files = document.querySelector('#local_file').files; if (files.length == 1) { var file = files[0]; var fileReader = new FileReader(); fileReader.onload = function(ev) { - context.decodeAudioData(ev.target.result, function(buffer) { - var buf = []; - var data = buffer.getChannelData(0); - var old = (data[0] > 0.25); - var last = 0; - for (var idx = 1; idx < data.length; idx++) { - var current = (data[idx] > 0.25); - if (current != old) { - var delta = idx - last; - buf.push(parseInt(delta / buffer.sampleRate * 1023000)); - old = current; - last = idx; + context.decodeAudioData( + ev.target.result, + function(buffer) { + var buf = []; + var data = buffer.getChannelData(0); + var old = (data[0] > 0.25); + var last = 0; + for (var idx = 1; idx < data.length; idx++) { + var current = (data[idx] > 0.25); + if (current != old) { + var delta = idx - last; + buf.push(parseInt(delta / buffer.sampleRate * 1023000)); + old = current; + last = idx; + } } + aci.buffer = buf; + MicroModal.close('local-modal'); + }, + function(error) { + window.alert(error.message); } - aci.buffer = buf; - MicroModal.close('local-modal'); - }); + ); }; fileReader.readAsArrayBuffer(file); }