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

Allow skins to wrap menu item link labels in spans

Browse source 
This is going to be needed for skins that support icons as
in the new mw-ui-icon implementation, labels must be wrapped
in spans.

This is made a skin option so skins can control.
It will be used in Vector (Ia2d2c86e61341b9900f9ac337ddd763252e0515f)

Bug: T191021
Change-Id: I2bfaebf5d766240b57d7baed445001a007634839
This commit is contained in:
jdlrobson 2021-06-30 13:57:40 -07:00 committed by Bernard Wang
parent 10d4adf6e1
commit 14188e13f0
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
includes/skins/Skin.php
View file

@ -42,6 +42,11 @@ use Wikimedia\WrappedStringList;
abstract class Skin extends ContextSource {
use ProtectedHookAccessorTrait;
/**
* @var array link options used in Skin::makeLink. Can be set by skin option `link`.
*/
private $defaultLinkOptions = [];
/**
* @var string|null
*/
@ -171,6 +176,7 @@ abstract class Skin extends ContextSource {
* `responsive` indicates if a skin supports responsive behaviour and a viewport meta
* tag can be set on the skin. Note, users can disable this feature via user
* preference.
* `link` an array of link options that will be used in makeLink calls. See Skin::makeLink
*/
public function __construct( $options = null ) {
if ( is_string( $options ) ) {
@ -182,6 +188,9 @@ abstract class Skin extends ContextSource {
throw new SkinException( 'Skin name must be specified' );
}
if ( isset( $options['link'] ) ) {
$this->defaultLinkOptions = $options['link'];
}
$this->options = $options;
$this->skinname = $name;
}
@ -2342,7 +2351,7 @@ abstract class Skin extends ContextSource {
* The "class" key currently accepts both a string and an array of classes, but this will be
* changed to only accept an array in the future.
*
* @param array $options Can be used to affect the output of a link.
* @param array $linkOptions Can be used to affect the output of a link.
* Possible options are:
* - 'text-wrapper' key to specify a list of elements to wrap the text of
* a link in. This should be an array of arrays containing a 'tag' and
@ -2358,7 +2367,8 @@ abstract class Skin extends ContextSource {
*
* @return string
*/
final public function makeLink( $key, $item, $options = [] ) {
final public function makeLink( $key, $item, $linkOptions = [] ) {
$options = $linkOptions + $this->defaultLinkOptions;
$text = $item['text'] ?? $this->msg( $item['msg'] ?? $key )->text();
$html = htmlspecialchars( $text );