Relax checksum test in disk.restore()
This commit is contained in:
parent
a54cbeeba8
commit
605146075b
12 changed files with 1108 additions and 1080 deletions
|
|
@ -14,7 +14,7 @@
|
||||||
<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
|
<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
|
||||||
<debugger id="debugger"/>
|
<debugger id="debugger"/>
|
||||||
<panel ref="/devices/pc/panel/default.xml"/>
|
<panel ref="/devices/pc/panel/default.xml"/>
|
||||||
<fdc id="fdcNEC" width="280px" pos="left" padleft="8px" automount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pc/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"Executive Suite (1982)",path:"/apps/pc/1982/esuite/disk.json"}}'>
|
<fdc id="fdcNEC" width="280px" pos="left" padleft="8px" padbottom="8px" automount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pc/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"Executive Suite (1982)",path:"/apps/pc/1982/esuite/disk.json"}}'>
|
||||||
<control type="list" class="input" binding="listDrives"/>
|
<control type="list" class="input" binding="listDrives"/>
|
||||||
<control type="list" class="input" binding="listDisks">
|
<control type="list" class="input" binding="listDisks">
|
||||||
<disk path="">None</disk>
|
<disk path="">None</disk>
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
<control type="button" class="input" binding="run">Run</control>
|
<control type="button" class="input" binding="run">Run</control>
|
||||||
</cpu>
|
</cpu>
|
||||||
<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
|
<keyboard ref="/devices/pc/keyboard/minimal.xml"/>
|
||||||
<fdc id="fdcNEC" width="360px" pos="left" padleft="8px" automount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pc/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"Executive Suite (1982)",path:"/apps/pc/1982/esuite/disk.json"}}'>
|
<fdc id="fdcNEC" width="360px" pos="left" padleft="8px" padbottom="8px" automount='{A:{name:"PC-DOS 2.00 (Disk 1)",path:"/disks/pc/dos/ibm/2.00/PCDOS200-DISK1.json"}, B:{name:"Executive Suite (1982)",path:"/apps/pc/1982/esuite/disk.json"}}'>
|
||||||
<control type="list" class="input" binding="listDrives"/>
|
<control type="list" class="input" binding="listDrives"/>
|
||||||
<control type="list" class="input" binding="listDisks">
|
<control type="list" class="input" binding="listDisks">
|
||||||
<disk path="">None</disk>
|
<disk path="">None</disk>
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,11 @@
|
||||||
font-family: Monaco, monospace;
|
font-family: Monaco, monospace;
|
||||||
font-size: x-small;
|
font-size: x-small;
|
||||||
}
|
}
|
||||||
|
.pcjs-fieldset {
|
||||||
|
border: none;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
.pcjs-flag {
|
.pcjs-flag {
|
||||||
font-family: "Lucida Console", monospace;
|
font-family: "Lucida Console", monospace;
|
||||||
font-size: small;
|
font-size: small;
|
||||||
|
|
|
||||||
|
|
@ -355,6 +355,14 @@
|
||||||
<xsl:when test="@type = 'heading'">
|
<xsl:when test="@type = 'heading'">
|
||||||
<div><xsl:value-of select="."/></div>
|
<div><xsl:value-of select="."/></div>
|
||||||
</xsl:when>
|
</xsl:when>
|
||||||
|
<xsl:when test="@type = 'file'">
|
||||||
|
<form class="{$APPCLASS}-{@class}" data-value="{$type},{$binding}">
|
||||||
|
<fieldset class="{$APPCLASS}-fieldset">
|
||||||
|
<input type="file"/>
|
||||||
|
<input type="submit" value="Mount" disabled="true"/>
|
||||||
|
</fieldset>
|
||||||
|
</form>
|
||||||
|
</xsl:when>
|
||||||
<xsl:when test="@type = 'separator'">
|
<xsl:when test="@type = 'separator'">
|
||||||
<hr/>
|
<hr/>
|
||||||
</xsl:when>
|
</xsl:when>
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1554,7 +1554,7 @@ Disk.prototype.restore = function(deltas)
|
||||||
* just as well, since v1.01 also failed to properly deal with situations where the user mounted different diskette(s)
|
* just as well, since v1.01 also failed to properly deal with situations where the user mounted different diskette(s)
|
||||||
* prior to exiting (hopefully fixed in v1.02).
|
* prior to exiting (hopefully fixed in v1.02).
|
||||||
*/
|
*/
|
||||||
else if (aDiskInfo[1] != null && aDiskInfo[1] != this.dwChecksum) {
|
else if (aDiskInfo[1] != null && this.dwChecksum != null && aDiskInfo[1] != this.dwChecksum) {
|
||||||
sReason = "original checksum (" + aDiskInfo[1] + ") differs from current checksum (" + this.dwChecksum + ")";
|
sReason = "original checksum (" + aDiskInfo[1] + ") differs from current checksum (" + this.dwChecksum + ")";
|
||||||
nChanges = -1;
|
nChanges = -1;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -126,6 +126,7 @@ pre a, code a {
|
||||||
width: 140px; /* should be <= margin-left of common-main */
|
width: 140px; /* should be <= margin-left of common-main */
|
||||||
padding-bottom: 20px;
|
padding-bottom: 20px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
white-space: nowrap;
|
||||||
word-wrap: break-word;
|
word-wrap: break-word;
|
||||||
}
|
}
|
||||||
.common-list {
|
.common-list {
|
||||||
|
|
@ -237,6 +238,7 @@ pre a, code a {
|
||||||
*/
|
*/
|
||||||
.common-sidebar {
|
.common-sidebar {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
white-space: normal;
|
||||||
}
|
}
|
||||||
.common-list {
|
.common-list {
|
||||||
padding-left: 0;
|
padding-left: 0;
|
||||||
|
|
|
||||||
|
|
@ -122,6 +122,7 @@ pre a, code a {
|
||||||
width: 140px;
|
width: 140px;
|
||||||
padding-bottom: 20px;
|
padding-bottom: 20px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
white-space: nowrap;
|
||||||
word-wrap: break-word;
|
word-wrap: break-word;
|
||||||
}
|
}
|
||||||
.common-list {
|
.common-list {
|
||||||
|
|
@ -227,6 +228,7 @@ pre a, code a {
|
||||||
|
|
||||||
.common-sidebar {
|
.common-sidebar {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
white-space: normal;
|
||||||
}
|
}
|
||||||
.common-list {
|
.common-list {
|
||||||
padding-left: 0;
|
padding-left: 0;
|
||||||
|
|
|
||||||
|
|
@ -122,6 +122,7 @@ pre a, code a {
|
||||||
width: 140px;
|
width: 140px;
|
||||||
padding-bottom: 20px;
|
padding-bottom: 20px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
white-space: nowrap;
|
||||||
word-wrap: break-word;
|
word-wrap: break-word;
|
||||||
}
|
}
|
||||||
.common-list {
|
.common-list {
|
||||||
|
|
@ -227,6 +228,7 @@ pre a, code a {
|
||||||
|
|
||||||
.common-sidebar {
|
.common-sidebar {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
white-space: normal;
|
||||||
}
|
}
|
||||||
.common-list {
|
.common-list {
|
||||||
padding-left: 0;
|
padding-left: 0;
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue