Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "resourceloader: Mention ECMAScript version in JS parse error"

Browse source
This commit is contained in:
jenkins-bot 2020-06-02 18:02:49 +00:00 committed by Gerrit Code Review
commit ffb748b33b
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
includes/resourceloader/ResourceLoaderModule.php
View file

@ -982,9 +982,9 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface {
// By returning this as replacement for the actual script,
// we ensure modules are safe to load in a batch request,
// without causing other unrelated modules to break.
return 'mw.log.error(' .
Xml::encodeJsVar( 'JavaScript parse error: ' . $err->getMessage() ) .
');';
return 'mw.log.error(' . Xml::encodeJsVar(
'JavaScript parse error (scripts need to be valid ECMAScript 5): ' .
$err->getMessage() ) . ');';
}
return $contents;
}

4
tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php
View file

@ -92,8 +92,8 @@ class ResourceLoaderModuleTest extends ResourceLoaderTestCase {
] );
$this->assertEquals(
'mw.log.error(' .
'"JavaScript parse error: Parse error: Unexpected token; ' .
'token } expected in file \'input\' on line 3"' .
'"JavaScript parse error (scripts need to be valid ECMAScript 5): ' .
'Parse error: Unexpected token; token } expected in file \'input\' on line 3"' .
');',
$module->getScript( $context ),
'Replace invalid syntax with error logging'