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

Firefox fix

Browse source
This commit is contained in:
Jeff Parsons 2016-02-17 11:20:09 -08:00
commit c69f2ee51f
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/pcjs/lib/debugger.js
View file

@ -8072,6 +8072,7 @@ if (DEBUGGER) {
break; break;
} }
this.println((APPNAME || "PCjs") + " version " + (XMLVERSION || APPVERSION) + " (" + this.cpu.model + (COMPILED? ",RELEASE" : (DEBUG? ",DEBUG" : ",NODEBUG")) + (PREFETCH? ",PREFETCH" : ",NOPREFETCH") + (TYPEDARRAYS? ",TYPEDARRAYS" : (BYTEARRAYS? ",BYTEARRAYS" : ",LONGARRAYS")) + (BACKTRACK? ",BACKTRACK" : ",NOBACKTRACK") + ')'); this.println((APPNAME || "PCjs") + " version " + (XMLVERSION || APPVERSION) + " (" + this.cpu.model + (COMPILED? ",RELEASE" : (DEBUG? ",DEBUG" : ",NODEBUG")) + (PREFETCH? ",PREFETCH" : ",NOPREFETCH") + (TYPEDARRAYS? ",TYPEDARRAYS" : (BYTEARRAYS? ",BYTEARRAYS" : ",LONGARRAYS")) + (BACKTRACK? ",BACKTRACK" : ",NOBACKTRACK") + ')');
this.println(web.getUserAgent());
break; break;
case 'x': case 'x':
this.doExecOptions(asArgs); this.doExecOptions(asArgs);

21
modules/shared/lib/save.js
View file

@ -157,20 +157,20 @@ function downloadPC(sURL, sPCJS, nErrorCode, aMachineInfo)
} }
if (sXMLFile && sXSLFile) { if (sXMLFile && sXSLFile) {
var uri;
var sResources = JSON.stringify(resNew); var sResources = JSON.stringify(resNew);
var sScriptFile = str.getBaseName(sURL, true); var sScriptFile = str.getBaseName(sURL, true);
sPCJS = matchScript[1] + "var resources=" + sResources + ";" + matchScript[2] + matchScript[3]; sPCJS = matchScript[1] + "var resources=" + sResources + ";" + matchScript[2] + matchScript[3];
Component.log("saving machine: '" + idMachine + "' (" + sPCJS.length + " bytes)"); Component.log("saving machine: '" + idMachine + "' (" + sPCJS.length + " bytes)");
var uri;
if (MAXDEBUG) { if (MAXDEBUG) {
sPCJS = sPCJS.replace(/[\u00A0-\u2666]/g, function(c) { sPCJS = sPCJS.replace(/[\u00A0-\u2666]/g, function(c) {
return '&#' + c.charCodeAt(0) + ';'; return '&#' + c.charCodeAt(0) + ';';
}); });
uri = "data:application/javascript;base64," + btoa(sPCJS); uri = "data:application/javascript;base64," + btoa(sPCJS);
} else { } else {
uri = "data:application/javascript," + encodeURI(sPCJS); uri = "data:application/javascript," + (web.isUserAgent("Firefox")? encodeURIComponent(sPCJS) : encodeURI(sPCJS));
} }
var link = document.createElement('a'); var link = document.createElement('a');
@ -180,17 +180,18 @@ function downloadPC(sURL, sPCJS, nErrorCode, aMachineInfo)
document.body.appendChild(link); // Firefox requires the link to be in the body (?) document.body.appendChild(link); // Firefox requires the link to be in the body (?)
link.click(); link.click();
document.body.removeChild(link); document.body.removeChild(link);
var sAlert = 'Check your Downloads folder for "' + sScriptFile + '.json", ';
sAlert += 'copy it to your web server as "' + sScriptFile + '.js", and then add the following to your web page:\n\n';
sAlert += '<div id="' + idMachine + '"></div>\n';
sAlert += '...\n';
sAlert += '<script type="text/javascript" src="' + sScriptFile + '.js"></script>\n';
sAlert += '<script type="text/javascript">embedPC("' + idMachine + '","' + sXMLFile + '","' + sXSLFile + '");</script>\n\n';
sAlert += 'The machine should appear where the <div> is located.';
web.alertUser(sAlert);
} else { } else {
window.open(uri); window.open(uri);
} }
var sAlert = 'Check your Downloads folder for "' + sScriptFile + '.json", ';
sAlert += 'copy it to your web server as "' + sScriptFile + '.js", and then add the following to your web page:\n\n';
sAlert += '<div id="' + idMachine + '"></div>\n';
sAlert += '...\n';
sAlert += '<script type="text/javascript" src="' + sScriptFile + '.js"></script>\n';
sAlert += '<script type="text/javascript">embedPC("' + idMachine + '","' + sXMLFile + '","' + sXSLFile + '");</script>\n\n';
sAlert += 'The machine should appear where the <div> is located.';
web.alertUser(sAlert);
} else { } else {
web.alertUser("Missing XML/XSL resources"); web.alertUser("Missing XML/XSL resources");
} }