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

EditPage: Declare 'mediawiki.toolbar' needed for inline script

Browse source 
Switch from passing a plain function to RLQ that calls depends
on using() from 'mediawiki.base' and 'jquery', to using the new
array format introduced in Ica7bb9c3bdb (T192623).

This ensures the code will keep after we change the fact that
RLQ is blocked by base modules.

Bug: T192623
Change-Id: Id50e6dcc28c13b021d8395a2da0d83b46f88e18c
This commit is contained in:
Timo Tijhof 2018-08-07 19:45:10 +01:00
parent 73e24f255c
commit fb997e1389
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
includes/EditPage.php
View file

@ -4138,7 +4138,7 @@ ERROR;
]
];
$script = 'mw.loader.using("mediawiki.toolbar", function () {';
$script = '';
foreach ( $toolarray as $tool ) {
if ( !$tool ) {
continue;
@ -4165,15 +4165,16 @@ ERROR;
);
}
$script .= '});';
$toolbar = '<div id="toolbar"></div>';
if ( Hooks::run( 'EditPageBeforeEditToolbar', [ &$toolbar ] ) ) {
// Only add the old toolbar cruft to the page payload if the toolbar has not
// been over-written by a hook caller
$nonce = $wgOut->getCSPNonce();
$wgOut->addScript( ResourceLoader::makeInlineScript( $script, $nonce ) );
$wgOut->addScript( Html::inlineScript(
ResourceLoader::makeInlineCodeWithModule( 'mediawiki.toolbar', $script ),
$nonce
) );
};
return $toolbar;

17
includes/resourceloader/ResourceLoader.php
View file

@ -1490,10 +1490,27 @@ MESSAGE;
* @return string JavaScript code
*/
public static function makeLoaderConditionalScript( $script ) {
// Adds a function to lazy-created RLQ
return '(window.RLQ=window.RLQ||[]).push(function(){' .
trim( $script ) . '});';
}
/**
* Wraps JavaScript code to run after a required module.
*
* @since 1.32
* @param string|string[] $modules Module name(s)
* @param string $script JavaScript code
* @return string JavaScript code
*/
public static function makeInlineCodeWithModule( $modules, $script ) {
// Adds an array to lazy-created RLQ
return '(window.RLQ=window.RLQ||[]).push(['
. json_encode( $modules ) . ','
. 'function(){' . trim( $script ) . '}'
. ']);';
}
/**
* Returns an HTML script tag that runs given JS code after startup and base modules.
*