novarobot
/
webperl-for
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored base URL finding and used in mini IDE

Browse Source
master
Hauke D 7 years ago
parent 4b2edd16c4
commit fe718b08f0
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File

3
web/mini_ide/webperl_mini_ide.html
Unescape Escape View File

@ -70,8 +70,7 @@ window.onerror = function(event) {
// This is a workaround for Emscripten only being able to call main() once per page load. // This is a workaround for Emscripten only being able to call main() once per page load.
// I wouldn't recommend this for "production" use. // I wouldn't recommend this for "production" use.
var baseurl = new URL(window.location); var baseurl = Perl.Util.baseurl(window.location);
baseurl = baseurl.origin + baseurl.pathname.substring(0,baseurl.pathname.lastIndexOf('/'));
function run_perl_iframe (argv, state_callback, done_callback) { function run_perl_iframe (argv, state_callback, done_callback) {
var html = '<html><head><base href="'+baseurl+'"><script src="webperl.js"></scr'+'ipt></head><body></body></html>'; var html = '<html><head><base href="'+baseurl+'"><script src="webperl.js"></scr'+'ipt></head><body></body></html>';
var blob = new Blob([html], {type: "text/html;charset=utf-8"}); var blob = new Blob([html], {type: "text/html;charset=utf-8"});

20
web/webperl.js
Unescape Escape View File

@ -27,6 +27,7 @@ var Module;
var Perl = { var Perl = {
trace: false, // user may enable this trace: false, // user may enable this
endAfterMain: false, // user may enable this (before Perl.init) endAfterMain: false, // user may enable this (before Perl.init)
Util: {},
// internal variables: // internal variables:
initStepsLeft: 2, // Must match number of Perl.initStepFinished() calls! initStepsLeft: 2, // Must match number of Perl.initStepFinished() calls!
state: "Uninitialized", state: "Uninitialized",
@ -179,18 +180,21 @@ var getScriptURL = (function() { // with thanks to https://stackoverflow.com/a/2
return function() { return myScript.src; }; return function() { return myScript.src; };
})(); })();
Perl.Util.baseurl = function (urlstr) {
var url = new URL(urlstr);
if (url.protocol=='file:')
return url.href.substring(0, url.href.lastIndexOf('/'));
else
return url.origin + url.pathname.substring(0, url.pathname.lastIndexOf('/'));
};
Perl.init = function (readyCallback) { Perl.init = function (readyCallback) {
if (Perl.state != "Uninitialized") if (Perl.state != "Uninitialized")
throw "Perl: can't call init in state "+Perl.state; throw "Perl: can't call init in state "+Perl.state;
Perl.changeState("Initializing"); Perl.changeState("Initializing");
var baseurl = new URL(getScriptURL()); // Note that a lot of things still won't work for file:// URLs because of the Same-Origin Policy.
if (baseurl.protocol=='file:') // see e.g. https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS/Errors/CORSRequestNotHttp
// Note that a lot of things still won't work for file:// URLs var baseurl = Perl.Util.baseurl(getScriptURL());
// because of the Same-Origin Policy.
// see e.g. https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS/Errors/CORSRequestNotHttp
baseurl = baseurl.href.substring(0,baseurl.href.lastIndexOf('/'));
else
baseurl = baseurl.origin + baseurl.pathname.substring(0,baseurl.pathname.lastIndexOf('/'));
Perl.readyCallback = readyCallback; Perl.readyCallback = readyCallback;
Module = { Module = {
noInitialRun: true, noInitialRun: true,

Write Preview
Loading…
Cancel
Save