mirror of
https://github.com/whscullin/apple2js.git
synced 2024-01-12 14:14:38 +00:00
Clean up disk storage
Try and consolidate all disk loading/saving into one UI.
This commit is contained in:
parent
e399533ed4
commit
22acb1b6da
@ -81,7 +81,6 @@ function DriveLights()
|
|||||||
"url(css/red-off-16.png)");
|
"url(css/red-off-16.png)");
|
||||||
},
|
},
|
||||||
dirty: function(drive, dirty) {
|
dirty: function(drive, dirty) {
|
||||||
$("#disksave" + drive).button("option", "disabled", !dirty);
|
|
||||||
},
|
},
|
||||||
label: function(drive, label) {
|
label: function(drive, label) {
|
||||||
$("#disklabel" + drive).text(label);
|
$("#disklabel" + drive).text(label);
|
||||||
@ -95,28 +94,18 @@ var _loadDrive = 1;
|
|||||||
function openLoad(drive, event)
|
function openLoad(drive, event)
|
||||||
{
|
{
|
||||||
_loadDrive = drive;
|
_loadDrive = drive;
|
||||||
if (event.metaKey) {
|
|
||||||
openLoadJSON(drive);
|
|
||||||
} else if (event.altKey) {
|
|
||||||
openLoadLocal(drive);
|
|
||||||
} else {
|
|
||||||
if (disk_cur_cat[drive]) {
|
if (disk_cur_cat[drive]) {
|
||||||
$("#category_select").val(disk_cur_cat[drive]).change();
|
$("#category_select").val(disk_cur_cat[drive]).change();
|
||||||
}
|
}
|
||||||
$("#load").dialog("open");
|
$("#load").dialog("open");
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
function openSave(drive, event)
|
function openSave(drive, event)
|
||||||
{
|
{
|
||||||
_saveDrive = drive;
|
_saveDrive = drive;
|
||||||
if (event.metaKey) {
|
|
||||||
dumpDisk(drive);
|
|
||||||
} else {
|
|
||||||
$("#save_name").val($("#disklabel" + drive).text());
|
$("#save_name").val($("#disklabel" + drive).text());
|
||||||
$("#save").dialog("open");
|
$("#save").dialog("open");
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
var loading = false;
|
var loading = false;
|
||||||
|
|
||||||
@ -134,7 +123,7 @@ function loadAjax(url) {
|
|||||||
|
|
||||||
function doLoad() {
|
function doLoad() {
|
||||||
var urls = $("#disk_select").val(), url;
|
var urls = $("#disk_select").val(), url;
|
||||||
if (urls.length) {
|
if (urls && urls.length) {
|
||||||
if (typeof(urls) == "string") {
|
if (typeof(urls) == "string") {
|
||||||
url = urls;
|
url = urls;
|
||||||
} else {
|
} else {
|
||||||
@ -142,17 +131,16 @@ function doLoad() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (url) {
|
var files = $("#local_file").prop("files");
|
||||||
|
if (files.length == 1) {
|
||||||
|
doLoadLocal();
|
||||||
|
} else if (url) {
|
||||||
var filename;
|
var filename;
|
||||||
$("#load").dialog("close");
|
$("#load").dialog("close");
|
||||||
if (url.substr(0,6) == "local:") {
|
if (url.substr(0,6) == "local:") {
|
||||||
filename = url.substr(6);
|
filename = url.substr(6);
|
||||||
if (filename == "__manage") {
|
if (filename == "__manage") {
|
||||||
openManage();
|
openManage();
|
||||||
} else if (name == "__setjson") {
|
|
||||||
openLoadJSON(_loadDrive);
|
|
||||||
} else if (name == "__getjson") {
|
|
||||||
dumpDisk(_loadDrive);
|
|
||||||
} else {
|
} else {
|
||||||
loadLocalStorage(_loadDrive, filename);
|
loadLocalStorage(_loadDrive, filename);
|
||||||
}
|
}
|
||||||
@ -179,18 +167,6 @@ function doDelete(name) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function openLoadJSON(drive) {
|
|
||||||
_saveDrive = drive;
|
|
||||||
$("#json_input").val("");
|
|
||||||
$("#json").dialog("open");
|
|
||||||
}
|
|
||||||
|
|
||||||
function doLoadJSON() {
|
|
||||||
if (disk2.setJSON(_saveDrive, $("#json_input").val())) {
|
|
||||||
$("#json").dialog("close");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function doLoadLocal() {
|
function doLoadLocal() {
|
||||||
var files = $("#local_file").prop("files")
|
var files = $("#local_file").prop("files")
|
||||||
if (files.length == 1) {
|
if (files.length == 1) {
|
||||||
@ -200,7 +176,7 @@ function doLoadLocal() {
|
|||||||
var parts = file.name.split(".");
|
var parts = file.name.split(".");
|
||||||
var name = parts[0], ext = parts[parts.length - 1].toLowerCase();
|
var name = parts[0], ext = parts[parts.length - 1].toLowerCase();
|
||||||
if (disk2.setBinary(_saveDrive, name, ext, this.result)) {
|
if (disk2.setBinary(_saveDrive, name, ext, this.result)) {
|
||||||
$("#local").dialog("close");
|
$("#load").dialog("close");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fileReader.readAsArrayBuffer(file);
|
fileReader.readAsArrayBuffer(file);
|
||||||
@ -830,14 +806,6 @@ $(function() {
|
|||||||
modal: true,
|
modal: true,
|
||||||
width: 320,
|
width: 320,
|
||||||
buttons: {"Close": cancel }});
|
buttons: {"Close": cancel }});
|
||||||
$("#json").dialog({ autoOpen: false,
|
|
||||||
modal: true,
|
|
||||||
width: 530,
|
|
||||||
buttons: {"Cancel": cancel, "OK": doLoadJSON }});
|
|
||||||
$("#local").dialog({ autoOpen: false,
|
|
||||||
modal: true,
|
|
||||||
width: 530,
|
|
||||||
buttons: {"Cancel": cancel, "OK": doLoadLocal }});
|
|
||||||
|
|
||||||
if (window.localStorage !== undefined) {
|
if (window.localStorage !== undefined) {
|
||||||
$("button.disksave").show();
|
$("button.disksave").show();
|
||||||
@ -914,7 +882,7 @@ $(function() {
|
|||||||
Load
|
Load
|
||||||
</button>
|
</button>
|
||||||
<button id="disksave1" class="disksave" value="Save"
|
<button id="disksave1" class="disksave" value="Save"
|
||||||
disabled="disabled" onclick="openSave(1, event);">
|
onclick="openSave(1, event);">
|
||||||
Save
|
Save
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@ -926,7 +894,7 @@ $(function() {
|
|||||||
Load
|
Load
|
||||||
</button>
|
</button>
|
||||||
<button id="disksave2" class="disksave" value="Save"
|
<button id="disksave2" class="disksave" value="Save"
|
||||||
disabled="disabled" onclick="openSave(2, event);">
|
onclick="openSave(2, event);">
|
||||||
Save
|
Save
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@ -1022,17 +990,6 @@ $(function() {
|
|||||||
</div>
|
</div>
|
||||||
<div id="manage" title="Manage Disks">
|
<div id="manage" title="Manage Disks">
|
||||||
</div>
|
</div>
|
||||||
<div id="json" title="Input JSON">
|
|
||||||
<form action="#">
|
|
||||||
<textarea id="json_input" rows="24" cols="80">
|
|
||||||
</textarea>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
<div id="local" title="Load Local File">
|
|
||||||
<form action="#">
|
|
||||||
<input type="file" id="local_file" />
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
<div id="load" title="Load Disk">
|
<div id="load" title="Load Disk">
|
||||||
<table>
|
<table>
|
||||||
<tr>
|
<tr>
|
||||||
@ -1051,6 +1008,9 @@ $(function() {
|
|||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
<form action="#">
|
||||||
|
<input type="file" id="local_file" />
|
||||||
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
BIN
css/scanlines.png
Normal file
BIN
css/scanlines.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.4 KiB |
Loading…
Reference in New Issue
Block a user