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

Some minor Debugger tweaks and other improvements

Browse source 
If a Markdown document contains an embedded machine that specifies a version number (eg, "1.15.6"), then the web server will switch to serving a compiled version, since that's the only way it can guarantee the requested version
This commit is contained in:
Jeff Parsons 2014-10-31 17:44:34 -07:00 • committed by jeffpar
commit 905a30017e
9 changed files with 911 additions and 889 deletions
Download patch file Download diff file Expand all files Collapse all files

12
my_modules/htmlout/lib/htmlout.js
View file

@ -1747,12 +1747,20 @@ HTMLOut.prototype.processMachines = function(aMachines, done)
HTMLOut.logDebug('HTMLOut.processMachines(' + JSON.stringify(infoMachine) + ')');
var sClass = infoMachine['class']; // aka the machine class
var sVersion = infoMachine['version'];
if (sVersion === undefined) sVersion = "*"; // default to newest version
var fDebugger = infoMachine['debugger'];
if (fDebugger === undefined) fDebugger = false; // default to no debugger
var fCompiled = infoMachine['compiled'];
if (fCompiled === undefined) fCompiled = !this.fDebug;
if (sVersion == "*") {
sVersion = pkg.version;
} else {
fCompiled = true; // use of a specific version requires using the compiled version
}
var fNoDebug = !fCompiled && net.hasParm(net.GORT_COMMAND, net.GORT_NODEBUG, this.req);
var sScriptEmbed = "";
@ -1764,8 +1772,8 @@ HTMLOut.prototype.processMachines = function(aMachines, done)
if (fCompiled) {
var sScriptFolder = sClass + "js"; // aka the app class
var sScriptFile = sClass + (fDebugger? "-dbg" : "") + ".js";
asFiles.push("/versions/" + sScriptFolder + "/" + pkg.version + "/components.css");
asFiles.push("/versions/" + sScriptFolder + "/" + pkg.version + "/" + sScriptFile);
asFiles.push("/versions/" + sScriptFolder + "/" + sVersion + "/components.css");
asFiles.push("/versions/" + sScriptFolder + "/" + sVersion + "/" + sScriptFile);
this.addFilesToHTML(asFiles, sScriptEmbed);
}
else {