wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-09-24 10:49:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Split up ext.echo.nojs into badge and notifications styles"

Browse source
This commit is contained in:
jenkins-bot 2015-09-17 21:51:17 +00:00 committed by Gerrit Code Review
parent 03b7cd2483 b539621b7f
commit 0dab0df15c
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Hooks.php
View file

@ -596,7 +596,7 @@ class EchoHooks {
$out->addModules( array( 'ext.echo.init' ) );
// Load the styles for the Notifications badge
$out->addModuleStyles( array(
'ext.echo.nojs',
'ext.echo.styles.badge',
'ext.echo.badgeicons'
) );
}
@ -728,7 +728,7 @@ class EchoHooks {
) {
$personal_urls['mytalk']['text'] = $sk->msg( 'echo-new-messages' )->text();
$personal_urls['mytalk']['class'] = array( 'mw-echo-alert' );
$sk->getOutput()->addModuleStyles( 'ext.echo.nojs.alert' );
$sk->getOutput()->addModuleStyles( 'ext.echo.styles.alert' );
}
return true;

16
Resources.php
View file

@ -53,7 +53,8 @@ $wgResourceModules += array(
)
),
'dependencies' => array(
'ext.echo.nojs',
'ext.echo.styles.badge',
'ext.echo.styles.notifications',
'ext.echo.dm',
'oojs-ui',
'ext.echo.logger',
@ -111,15 +112,22 @@ $wgResourceModules += array(
'targets' => array( 'desktop' ),
),
// Base no-js styles
'ext.echo.nojs' => $echoResourceTemplate + array(
'ext.echo.styles.badge' => $echoResourceTemplate + array(
'position' => 'top',
'styles' => array(
'nojs/mw.echo.badge.less',
),
'targets' => array( 'desktop', 'mobile' ),
),
// Styles for individual notification entries in flyout and Special:Notifications
'ext.echo.styles.notifications' => $echoResourceTemplate + array(
'position' => 'top',
'styles' => array(
'nojs/mw.echo.notifications.less'
),
'targets' => array( 'desktop', 'mobile' ),
),
'ext.echo.nojs.alert' => $echoResourceTemplate + array(
'ext.echo.styles.alert' => $echoResourceTemplate + array(
'position' => 'top',
'styles' => array(
'nojs/mw.echo.alert.less',
@ -134,7 +142,7 @@ $wgResourceModules += array(
),
'targets' => array( 'desktop', 'mobile' ),
),
'ext.echo.nojs.special' => $echoResourceTemplate + array(
'ext.echo.styles.special' => $echoResourceTemplate + array(
'position' => 'top',
'styles' => array(
'nojs/mw.echo.special.less',

2
includes/special/SpecialNotifications.php
View file

@ -134,7 +134,7 @@ class SpecialNotifications extends SpecialPage {
)
);
// For no-js support
$out->addModuleStyles( array( 'ext.echo.nojs', 'ext.echo.nojs.special' ) );
$out->addModuleStyles( array( 'ext.echo.styles.notifications', 'ext.echo.styles.special' ) );
DeferredUpdates::addCallableUpdate( function() use ( $user, $echoSeenTime, $unread ) {
// Mark items as read