wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-23 15:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Consistent Casing for "iconUrl""

Browse source
This commit is contained in:
jenkins-bot 2024-08-19 20:04:09 +00:00 committed by Gerrit Code Review
parent 48b3292504 14b06b78e5
commit 1b4ba9a09c
7 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/Formatters/EchoFlyoutFormatter.php
View file

@ -18,7 +18,7 @@ class EchoFlyoutFormatter extends EchoEventFormatter {
'img',
[
'class' => 'mw-echo-icon',
'src' => $this->getIconURL( $model ),
'src' => $this->getIconUrl( $model ),
]
);
@ -70,7 +70,7 @@ class EchoFlyoutFormatter extends EchoEventFormatter {
);
}
private function getIconURL( EchoEventPresentationModel $model ) {
private function getIconUrl( EchoEventPresentationModel $model ) {
return EchoIcon::getUrl(
$model->getIconType(),
$this->language->getDir()

4
includes/Formatters/SpecialNotificationsFormatter.php
View file

@ -23,7 +23,7 @@ class SpecialNotificationsFormatter extends EchoEventFormatter {
'img',
[
'class' => 'mw-echo-icon',
'src' => $this->getIconURL( $model ),
'src' => $this->getIconUrl( $model ),
]
);
@ -112,7 +112,7 @@ class SpecialNotificationsFormatter extends EchoEventFormatter {
);
}
private function getIconURL( EchoEventPresentationModel $model ) {
private function getIconUrl( EchoEventPresentationModel $model ) {
return EchoIcon::getUrl(
$model->getIconType(),
$this->language->getDir()

2
modules/controller/mw.echo.Controller.js
View file

@ -391,7 +391,7 @@
compactHeader: content.compactHeader,
body: content.body
},
iconURL: content.iconUrl,
iconUrl: content.iconUrl,
iconType: content.icon,
primaryUrl: OO.getProp( content.links, 'primary', 'url' ),
secondaryUrls: OO.getProp( content.links, 'secondary' ) || [],

2
modules/model/mw.echo.dm.BundleNotificationItem.js
View file

@ -29,7 +29,7 @@
// bundled notifications use the compact header and do not have icons
bundledNotificationModels.forEach( ( bundled ) => {
bundled.content.header = bundled.content.compactHeader;
delete bundled.iconURL;
delete bundled.iconUrl;
} );
this.list = new mw.echo.dm.NotificationsList();

6
modules/model/mw.echo.dm.NotificationItem.js
View file

@ -57,7 +57,7 @@
this.bundled = !!config.bundled;
this.source = config.source || '';
this.iconType = config.iconType;
this.iconURL = config.iconURL;
this.iconUrl = config.iconUrl;
this.read = !!config.read;
this.seen = !!config.seen;
@ -242,8 +242,8 @@
*
* @return {string} Notification icon URL
*/
mw.echo.dm.NotificationItem.prototype.getIconURL = function () {
return this.iconURL;
mw.echo.dm.NotificationItem.prototype.getIconUrl = function () {
return this.iconUrl;
};
/**

4
modules/ui/mw.echo.ui.NotificationItemWidget.js
View file

@ -39,7 +39,7 @@
} );
let $icon;
const iconUrl = this.model.getIconURL();
const iconUrl = this.model.getIconUrl();
// Icon
if ( iconUrl ) {
// Only invert non colored images
@ -52,7 +52,7 @@
$icon = $( '<div>' )
.addClass( `mw-echo-ui-notificationItemWidget-icon ${ invertIconClass }` )
.append( $( '<img>' ).attr( {
src: this.model.getIconURL(),
src: this.model.getIconUrl(),
role: 'presentation',
alt: ' '
} ) );

2
tests/qunit/model/test_mw.echo.dm.NotificationItem.js
View file

@ -80,7 +80,7 @@ QUnit.module( 'ext.echo.dm - NotificationItem', ( hooks ) => {
isBundled: false,
getTimestamp: nowFormatted,
getPrimaryUrl: undefined,
getIconURL: undefined,
getIconUrl: undefined,
getIconType: undefined,
getSecondaryUrls: [],
getModelName: 'local',