Merge branch 'master' into next-release
This commit is contained in:
commit
12d4662bbf
173 changed files with 84349 additions and 2592 deletions
|
|
@ -82,7 +82,7 @@ Next, we can add a Floppy Disk Controller (FDC) component. And since we want to
|
|||
disks at will, we'll include some UI controls.
|
||||
|
||||
<machine id="ibm" class="pc" width="720px">
|
||||
<fdc id="fdcNEC" automount="{A: {name: 'PC-DOS 1.0', path: 'pcdos-1.00.json'}}">
|
||||
<fdc id="fdcNEC" autoMount="{A: {name: 'PC-DOS 1.0', path: 'pcdos-1.00.json'}}">
|
||||
<control type="container">
|
||||
<control type="list" class="input" binding="listDrives"/>
|
||||
<control type="list" class="input" binding="listDisks">
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ Attributes
|
|||
to the whims of JavaScript, your web browser, and your machine's overall workload.
|
||||
* *multiplier* (optional; default is 1)
|
||||
* Provides an easy way to multiply the default CPU speed.
|
||||
* *autostart* (optional)
|
||||
* *autoStart* (optional)
|
||||
* This can be set to "true" or "false" to explicitly control whether or not the machine starts running automatically.
|
||||
If this parameter is omitted, the machine will autostart only if no Debugger component is included and no "Run" button is defined.
|
||||
|
||||
|
|
@ -49,7 +49,7 @@ Bindings
|
|||
|
||||
Example
|
||||
---
|
||||
<cpu id="cpu8088" model="8088" autostart="true">
|
||||
<cpu id="cpu8088" model="8088" autoStart="true">
|
||||
<control type="button" class="input" binding="run">Run</control>
|
||||
</cpu>
|
||||
|
||||
|
|
@ -57,7 +57,7 @@ Output
|
|||
---
|
||||
<div id="..." class="pc-cpu pc-component" style="">
|
||||
<div class="pc-container" style="">
|
||||
<div class="pcjs-cpu" data-value="id:'...',name:'...',model:'...',cycles:'...',multiplier:'...',autostart:'...'">
|
||||
<div class="pcjs-cpu" data-value="id:'...',name:'...',model:'...',cycles:'...',multiplier:'...',autoStart:'...'">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -182,7 +182,7 @@
|
|||
<xsl:choose>
|
||||
<xsl:when test="@pos = 'left'">float:left;</xsl:when>
|
||||
<xsl:when test="@pos = 'right'">float:right;</xsl:when>
|
||||
<xsl:when test="@pos = 'center'">margin:0 auto;</xsl:when>
|
||||
<xsl:when test="@pos = 'center'">margin:0 auto;clear:both;</xsl:when>
|
||||
<xsl:when test="@pos">position:<xsl:value-of select="@pos"/>;</xsl:when>
|
||||
<xsl:when test="$left != '' or $top != ''">position:relative;</xsl:when>
|
||||
<xsl:otherwise/>
|
||||
|
|
@ -348,11 +348,16 @@
|
|||
<xsl:if test="@label"><xsl:text> </xsl:text><xsl:value-of select="$APPCLASS"/><xsl:text>-label</xsl:text></xsl:if>
|
||||
</xsl:variable>
|
||||
<xsl:variable name="labelWidth">
|
||||
<xsl:if test="@labelwidth">width:<xsl:value-of select="@labelwidth"/>;</xsl:if>
|
||||
<xsl:choose>
|
||||
<xsl:when test="@labelwidth">width:<xsl:value-of select="@labelwidth"/>;</xsl:when>
|
||||
<xsl:when test="@labelWidth">width:<xsl:value-of select="@labelWidth"/>;</xsl:when>
|
||||
<xsl:otherwise/>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
<xsl:variable name="labelStyle">
|
||||
<xsl:choose>
|
||||
<xsl:when test="@labelstyle"><xsl:value-of select="@labelstyle"/></xsl:when>
|
||||
<xsl:when test="@labelStyle"><xsl:value-of select="@labelStyle"/></xsl:when>
|
||||
<xsl:otherwise>text-align:right;</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
|
|
@ -557,24 +562,28 @@
|
|||
<xsl:variable name="autoStart">
|
||||
<xsl:choose>
|
||||
<xsl:when test="@autostart"><xsl:value-of select="@autostart"/></xsl:when>
|
||||
<xsl:when test="@autoStart"><xsl:value-of select="@autoStart"/></xsl:when>
|
||||
<xsl:otherwise>null</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
<xsl:variable name="csStart">
|
||||
<xsl:choose>
|
||||
<xsl:when test="@csstart"><xsl:value-of select="@csstart"/></xsl:when>
|
||||
<xsl:when test="@csStart"><xsl:value-of select="@csStart"/></xsl:when>
|
||||
<xsl:otherwise>-1</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
<xsl:variable name="csInterval">
|
||||
<xsl:choose>
|
||||
<xsl:when test="@csinterval"><xsl:value-of select="@csinterval"/></xsl:when>
|
||||
<xsl:when test="@csInterval"><xsl:value-of select="@csInterval"/></xsl:when>
|
||||
<xsl:otherwise>-1</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
<xsl:variable name="csStop">
|
||||
<xsl:choose>
|
||||
<xsl:when test="@csstop"><xsl:value-of select="@csstop"/></xsl:when>
|
||||
<xsl:when test="@csStop"><xsl:value-of select="@csStop"/></xsl:when>
|
||||
<xsl:otherwise>-1</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
|
|
@ -746,12 +755,14 @@
|
|||
<xsl:variable name="charBOL">
|
||||
<xsl:choose>
|
||||
<xsl:when test="@charbol"><xsl:value-of select="@charbol"/></xsl:when>
|
||||
<xsl:when test="@charBOL"><xsl:value-of select="@charBOL"/></xsl:when>
|
||||
<xsl:otherwise>0</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
<xsl:variable name="tabSize">
|
||||
<xsl:choose>
|
||||
<xsl:when test="@tabsize"><xsl:value-of select="@tabsize"/></xsl:when>
|
||||
<xsl:when test="@tabSize"><xsl:value-of select="@tabSize"/></xsl:when>
|
||||
<xsl:otherwise>0</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
|
|
@ -936,12 +947,14 @@
|
|||
<xsl:variable name="screenWidth">
|
||||
<xsl:choose>
|
||||
<xsl:when test="@screenwidth"><xsl:value-of select="@screenwidth"/></xsl:when>
|
||||
<xsl:when test="@screenWidth"><xsl:value-of select="@screenWidth"/></xsl:when>
|
||||
<xsl:otherwise>256</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
<xsl:variable name="screenHeight">
|
||||
<xsl:choose>
|
||||
<xsl:when test="@screenheight"><xsl:value-of select="@screenheight"/></xsl:when>
|
||||
<xsl:when test="@screenHeight"><xsl:value-of select="@screenHeight"/></xsl:when>
|
||||
<xsl:otherwise>224</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
|
|
@ -966,12 +979,14 @@
|
|||
<xsl:variable name="charCols">
|
||||
<xsl:choose>
|
||||
<xsl:when test="@cols"><xsl:value-of select="@cols"/></xsl:when>
|
||||
<xsl:when test="@charCols"><xsl:value-of select="@charCols"/></xsl:when>
|
||||
<xsl:otherwise>80</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
<xsl:variable name="charRows">
|
||||
<xsl:choose>
|
||||
<xsl:when test="@rows"><xsl:value-of select="@rows"/></xsl:when>
|
||||
<xsl:when test="@charRows"><xsl:value-of select="@charRows"/></xsl:when>
|
||||
<xsl:otherwise>25</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
|
|
@ -979,24 +994,28 @@
|
|||
<xsl:choose>
|
||||
<xsl:when test="@charset"><xsl:value-of select="@charset"/></xsl:when>
|
||||
<xsl:when test="@fontrom"><xsl:value-of select="@fontrom"/></xsl:when>
|
||||
<xsl:when test="@fontROM"><xsl:value-of select="@fontROM"/></xsl:when>
|
||||
<xsl:otherwise/>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
<xsl:variable name="screenColor">
|
||||
<xsl:choose>
|
||||
<xsl:when test="@screencolor"><xsl:value-of select="@screencolor"/></xsl:when>
|
||||
<xsl:when test="@screenColor"><xsl:value-of select="@screenColor"/></xsl:when>
|
||||
<xsl:otherwise>black</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
<xsl:variable name="touchScreen">
|
||||
<xsl:choose>
|
||||
<xsl:when test="@touchscreen"><xsl:value-of select="@touchscreen"/></xsl:when>
|
||||
<xsl:when test="@touchScreen"><xsl:value-of select="@touchScreen"/></xsl:when>
|
||||
<xsl:otherwise/>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
<xsl:variable name="autoLock">
|
||||
<xsl:choose>
|
||||
<xsl:when test="@autolock"><xsl:value-of select="@autolock"/></xsl:when>
|
||||
<xsl:when test="@autoLock"><xsl:value-of select="@autoLock"/></xsl:when>
|
||||
<xsl:otherwise>false</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
|
|
@ -1064,12 +1083,14 @@
|
|||
<xsl:variable name="autoPower">
|
||||
<xsl:choose>
|
||||
<xsl:when test="@autopower"><xsl:value-of select="@autopower"/></xsl:when>
|
||||
<xsl:when test="@autoPower"><xsl:value-of select="@autoPower"/></xsl:when>
|
||||
<xsl:otherwise>true</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
<xsl:variable name="busWidth">
|
||||
<xsl:choose>
|
||||
<xsl:when test="@buswidth"><xsl:value-of select="@buswidth"/></xsl:when>
|
||||
<xsl:when test="@busWidth"><xsl:value-of select="@busWidth"/></xsl:when>
|
||||
<xsl:otherwise>20</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -22,7 +22,7 @@ Creates an instance of the Floppy Disk Controller (FDC) component. The FDC is re
|
|||
|
||||
Attributes
|
||||
---
|
||||
* *automount* (optional)
|
||||
* *autoMount* (optional)
|
||||
|
||||
This is an object definition containing one or more drive-letter properties.
|
||||
Each drive-letter property should contain, in turn, another object definition with 'name' and 'path' properties.
|
||||
|
|
@ -53,7 +53,7 @@ Bindings
|
|||
|
||||
Example
|
||||
---
|
||||
<fdc id="fdcNEC" automount="'{A: {name: "PC-DOS 1.0", path: "pcdos-1.00.json"}}'">
|
||||
<fdc id="fdcNEC" autoMount="'{A: {name: "PC-DOS 1.0", path: "pcdos-1.00.json"}}'">
|
||||
<control type="container">
|
||||
<control type="list" class="input" binding="listDrives"/>
|
||||
<control type="list" class="input" binding="listDisks">
|
||||
|
|
|
|||
Loading…
Reference in a new issue