mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor
synced 2024-11-29 08:34:54 +00:00
Merge "makeStaticLoader: Update output and re-sync"
This commit is contained in:
commit
4621c083a1
|
@ -162,21 +162,30 @@ class MakeStaticLoader extends Maintenance {
|
|||
$headAdd = $bodyAdd = '';
|
||||
|
||||
if ( isset( $registry['styles'] ) && $target !== 'test' ){
|
||||
foreach ($registry['styles'] as $style) {
|
||||
foreach ( $registry['styles'] as $path ) {
|
||||
if ( strpos( $path, 've-mw/' ) === 0 ) {
|
||||
continue;
|
||||
}
|
||||
$headAdd .= $indent . Html::element( 'link', array(
|
||||
'rel' => 'stylesheet',
|
||||
'href' => "$vePath/$style",
|
||||
'href' => "$vePath/$path",
|
||||
) ) . "\n";
|
||||
}
|
||||
}
|
||||
if ( isset( $registry['scripts'] ) ) {
|
||||
foreach ($registry['scripts'] as $script) {
|
||||
$bodyAdd .= $indent . Html::element( 'script', array( 'src' => "$vePath/$script" ) ) . "\n";
|
||||
foreach ( $registry['scripts'] as $path ) {
|
||||
if ( strpos( $path, 've-mw/' ) === 0 ) {
|
||||
continue;
|
||||
}
|
||||
$bodyAdd .= $indent . Html::element( 'script', array( 'src' => "$vePath/$path" ) ) . "\n";
|
||||
}
|
||||
}
|
||||
if ( isset( $registry['debugScripts'] ) ) {
|
||||
foreach ($registry['debugScripts'] as $script) {
|
||||
$bodyAdd .= $indent . Html::element( 'script', array( 'src' => "$vePath/$script" ) ) . "\n";
|
||||
foreach ( $registry['debugScripts'] as $path ) {
|
||||
if ( strpos( $path, 've-mw/' ) === 0 ) {
|
||||
continue;
|
||||
}
|
||||
$bodyAdd .= $indent . Html::element( 'script', array( 'src' => "$vePath/$path" ) ) . "\n";
|
||||
}
|
||||
}
|
||||
if ( isset( $registry['headAdd'] ) ) {
|
||||
|
|
|
@ -17,12 +17,12 @@
|
|||
) {
|
||||
document.write(
|
||||
'<link rel="stylesheet" ' +
|
||||
'href="../ui/styles/ve.ui.Icons-vector.css">'
|
||||
'href="../../ve/ui/styles/ve.ui.Icons-vector.css">'
|
||||
);
|
||||
} else {
|
||||
document.write(
|
||||
'<link rel="stylesheet" ' +
|
||||
'href="../ui/styles/ve.ui.Icons-raster.css">'
|
||||
'href="../../ve/ui/styles/ve.ui.Icons-raster.css">'
|
||||
);
|
||||
}
|
||||
</script>
|
||||
|
|
Loading…
Reference in a new issue