6502
/
8bitworkshop
mirror of https://github.com/sehugg/8bitworkshop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

updated to jquery 3.3.1, except for w2ui; markdown tweaks

This commit is contained in:
Steven Hugg 2018-11-21 15:58:44 -05:00
parent e51bd2a579
commit d5a89b0837
11 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
css/ui.css
View File

@ -341,3 +341,12 @@ div.markdown {
margin:3%;
padding:1em;
}
div.markdown table {
margin:1em;
}
div.markdown td {
padding:0.2em;
}
div.markdown th {
padding:0.2em;
}

2
embed.html
View File

@ -42,7 +42,7 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
</div>
</div>
<script src="jquery/jquery-2.2.3.min.js"></script>
<script src="jquery/jquery-3.3.1.min.js"></script>
<script src="javatari.js/release/javatari/javatari.js"></script>
<script src="src/cpu/z80fast.js"></script>

4
index.html
View File

@ -43,7 +43,7 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
<div id="controls_top" style="user-select: none">
<span class="dropdown">
<a class="btn btn-secondary dropdown-toggle" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Menu">
<span class="glyphicon glyphicon-menu-hamburger" aria-hidden="true"></span></button>
<span class="glyphicon glyphicon-menu-hamburger" aria-hidden="true"></span>
<span class="caret"></span>
</a>
<ul class="dropdown-menu" aria-labelledby="dropdownMenuButton">
@ -272,7 +272,7 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
</div>
</div>
<script src="jquery/jquery-2.2.3.min.js"></script>
<script src="jquery/jquery-3.3.1.min.js"></script>
<link rel="stylesheet" href="bootstrap/css/bootstrap.min.css">
<script src="bootstrap/js/bootstrap.min.js"></script>

2
jquery/jquery-3.3.1.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

21
package-lock.json generated
View File

@ -14,9 +14,18 @@
}
},
"@types/jquery": {
"version": "2.0.49",
"resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-2.0.49.tgz",
"integrity": "sha512-/9xLnYmohN/vD2gDnLS4cym8TUmrJu7DvZa/LELKzZjdPsvWVJiedsdu2SXNtb/DA7FGimqL2g0IoyhbNKLl8g==",
"version": "3.3.22",
"resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.22.tgz",
"integrity": "sha512-a4JDcIhJhHYnoWCkG3xT2CZxXZeA92JeREESorg0DMQ3ZsjuKF48h7XK4l5Gl2GRa/ItGRpKMT0pyK88yRgqXQ==",
"dev": true,
"requires": {
"@types/sizzle": "*"
}
},
"@types/sizzle": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz",
"integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==",
"dev": true
},
"@types/w2ui": {
@ -519,9 +528,9 @@
"dev": true
},
"jquery": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
"integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI=",
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
"integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==",
"dev": true
},
"jsbn": {

4
package.json
View File

@ -5,12 +5,12 @@
"dependencies": {},
"devDependencies": {
"@types/bootstrap": "^3.x",
"@types/jquery": "^2.x",
"@types/jquery": "^3.3.1",
"@types/w2ui": "^1.4.x",
"atob": "^2.1.x",
"btoa": "^1.2.x",
"clipboard": "^2.0.x",
"jquery": "^2.x",
"jquery": "^3.3.1",
"jsdom": "^12.0.x",
"lzg": "^1.0.x",
"mocha": "^5.2.x",

2
pixels.html
View File

@ -49,7 +49,7 @@ body {
</div>
</div>
<script src="jquery/jquery-2.2.3.min.js"></script>
<script src="jquery/jquery-3.3.1.min.js"></script>
<link rel="stylesheet" href="bootstrap/css/bootstrap.min.css">
<script src="bootstrap/js/bootstrap.min.js"></script>

6
src/ui.ts
View File

@ -510,7 +510,7 @@ function updateSelector() {
populateExamples(sel);
// set click handlers
sel.off('change').change(function(e) {
reloadPresetNamed($(this).val());
reloadPresetNamed($(this).val().toString());
});
}
@ -989,8 +989,8 @@ function setupReplaySlider() {
replayslider.on('change', sliderChanged);
$("#replay_min").click(() => { setFrameTo(1) });
$("#replay_max").click(() => { setFrameTo(stateRecorder.numFrames()); });
$("#replay_back").click(() => { setFrameTo(parseInt(replayslider.val()) - 1); });
$("#replay_fwd").click(() => { setFrameTo(parseInt(replayslider.val()) + 1); });
$("#replay_back").click(() => { setFrameTo(parseInt(replayslider.val().toString()) - 1); });
$("#replay_fwd").click(() => { setFrameTo(parseInt(replayslider.val().toString()) + 1); });
$("#replay_bar").show();
$("#dbg_record").click(_toggleRecording).show();
}

2
testemu.html
View File

@ -27,7 +27,7 @@
mocha.ui('bdd')
</script>
<script src="jquery/jquery-2.2.3.min.js"></script>
<script src="jquery/jquery-3.3.1.min.js"></script>
<script src="javatari.js/release/javatari/javatari.js"></script>
<script src="src/cpu/z80fast.js"></script>

2
testwave.html
View File

@ -70,7 +70,7 @@ body {
</div>
</div>
<script src="jquery/jquery-2.2.3.min.js"></script>
<script src="jquery/jquery-3.3.1.min.js"></script>
<link rel="stylesheet" href="bootstrap/css/bootstrap.min.css">
<script src="bootstrap/js/bootstrap.min.js"></script>

2
verilog.html
View File

@ -166,7 +166,7 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
</div>
</div>
<script src="jquery/jquery-2.2.3.min.js"></script>
<script src="jquery/jquery-3.3.1.min.js"></script>
<link rel="stylesheet" href="bootstrap/css/bootstrap.min.css">
<script src="bootstrap/js/bootstrap.min.js"></script>