Merged from MOODLE_17_STABLE:
add support for https source for popups previously fullscreen.php tried to load any javascript files that were running in the popup's parent. If the source of the script didn't start with "http:" it was assumed that it must be a relative path. This caused problems when it tried to make it into an absolute path. Fixed Regex to include support for https Credit: Peter Bulmer <[email protected]>
This commit is contained in:
@@ -29,7 +29,7 @@ for (var i = 0; i < scripts.length; ++i) {
|
||||
// document.write("<scr" + "ipt type=" + "\"script/javascript\"");
|
||||
// document.write(" src=\"../" + script.src + "\"></scr" + "ipt>");
|
||||
var new_script = document.createElement("script");
|
||||
if (/^http:/i.test(script.src)) {
|
||||
if (/^https?:/i.test(script.src)) {
|
||||
new_script.src = script.src;
|
||||
} else {
|
||||
new_script.src = "../" + script.src;
|
||||
|
||||
Reference in New Issue
Block a user