L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-59431 requirejs: better reporting if a JS file cannot be loaded

Browse Source
This commit is contained in:
Tim Hunt
2017-06-30 17:26:14 +01:00
parent 35d1b3da7a
commit e526050151
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/requirejs.php
+7 -2
View File
@@ -97,7 +97,12 @@ if ($rev > 0 and $rev < (time() + 60 * 60)) {
$content = '';
foreach ($jsfiles as $modulename => $jsfile) {
$js = file_get_contents($jsfile) . "\n";
$js = file_get_contents($jsfile);
if ($jsfile === false) {
error_log('Failed to load JavaScript file ' . $jsfile);
$js = '/* Failed to load JavaScript file ' . $jsfile . '. */';
}
$js .= "\n";
// Inject the module name into the define.
$replace = 'define(\'' . $modulename . '\', ';
$search = 'define(';
@@ -134,7 +139,7 @@ foreach ($jsfiles as $modulename => $jsfile) {
if (strpos($js, $search) === false) {
// We can't call debugging because we only have minimal config loaded.
header('HTTP/1.0 500 error');
die('JS file: ' . $shortfilename . ' does not contain a javascript module in AMD format. "define()" not found.');
die('JS file: ' . $shortfilename . ' cannot be loaded, or does not contain a javascript module in AMD format. "define()" not found.');
}
// Replace only the first occurrence.