Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pre-1.20.5 changes from next-release (more OS/2-related stuff)

Browse source
This commit is contained in:
Jeff Parsons 2016-01-21 12:01:56 -08:00
commit e08104893d
13 changed files with 1489 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/diskdump/lib/diskdump.js
View file

@ -1034,10 +1034,10 @@ DiskDump.prototype.dumpSectorOSI = function(nSectorSig, nSectorNum, nSectorPages
* fills out the rest of the sector.
*
* There are many compression schemes I could have adopted to reduce the size of
* JSON-encoded disk images, but for now, I keep it simple: trim all bytes from
* the end of each sector that match. This is easy for the simulator to deal with,
* since all it has to do is append zeros (or the specified pattern byte) to every
* under-sized sector.
* JSON-encoded disk images, but for now, I keep it simple: trim all matching bytes
* (DWORDs actually) from the end of each sector. This is easy for the simulator
* to deal with, since all it has to do is append zeros (or the specified pattern)
* to every under-sized sector.
*
* NOTE: The C1Pjs Simulator doesn't support this feature (yet), which is why
* trimSector() isn't used when dumping OSI disk images.

7
modules/markout/lib/markout.js
View file

@ -800,10 +800,9 @@ MarkOut.prototype.convertMDLines = function(s)
/**
* convertMDLinks(sBlock)
*
* Aside from basic "inline" Markdown links, we also support named anchors; if the link begins with '#',
* we strip the '#' and use the remainder of the link as the name of the anchor. To reference a named
* anchor from another link, you have to specify a path with '#' and the anchor name appended, in order
* to distinguish an anchor name from an anchor reference.
* Aside from basic "inline" Markdown links, we also support named anchors; if the link begins with '!',
* we strip the '!' and use the remainder of the link as the name of the anchor. To reference a named
* anchor from another link, specify a path with '#' and the anchor name appended.
*
* Note that the need for named anchors is somewhat diminished now that I automatically generate IDs for
* all heading tags (eg, <h1>); refer to the generateID() function that's used in convertMDBlocks().

2
modules/shared/templates/common.html
View file

@ -41,7 +41,7 @@
</ul>
</div>
<div class="common-top-right">
<p>Powered by <a href="http://nodejs.org" target="_blank">Node.js</a> and <a href="http://aws.amazon.com/elasticbeanstalk/" target="_blank">AWS</a> | <a href="http://github.com/jeffpar/pcjs" target="_blank">GitHub</a></p>
<p>Powered by <a href="http://nodejs.org" target="_blank">Node.js</a> and <a href="http://github.com/jeffpar/pcjs" target="_blank">GitHub</a></p>
</div>
</div>
<div class="common-middle">

2
modules/shared/templates/common.xsl
View file

@ -43,7 +43,7 @@
</ul>
</div>
<div class="common-top-right">
<p>Powered by <a href="http://nodejs.org" target="_blank">Node.js</a> and <a href="http://aws.amazon.com/elasticbeanstalk/" target="_blank">AWS</a> | <a href="http://github.com/jeffpar/pcjs" target="_blank">GitHub</a></p>
<p>Powered by <a href="http://nodejs.org" target="_blank">Node.js</a> and <a href="http://github.com/jeffpar/pcjs" target="_blank">GitHub</a></p>
</div>
</div>
</xsl:template>