jenkins-bot has submitted this change and it was merged.
Change subject: Only load nojs Special:Notifications styles on the special page
......................................................................
Only load nojs Special:Notifications styles on the special page
Bug: T112407
Change-Id: I4112c8b819127dea7c5e2117feedfeecf583ef1f
(cherry picked from commit 3940f523baf7b339e258ef563945e56e6c6861b8)
---
M Resources.php
M includes/special/SpecialNotifications.php
2 files changed, 8 insertions(+), 2 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Resources.php b/Resources.php
index 2259613..ed261ef 100644
--- a/Resources.php
+++ b/Resources.php
@@ -119,7 +119,6 @@
'styles' => array(
'nojs/mw.echo.badge.less',
'nojs/mw.echo.alert.less',
- 'nojs/mw.echo.special.less',
'nojs/mw.echo.notifications.less'
),
'skinStyles' => array(
@@ -132,6 +131,13 @@
),
'targets' => array( 'desktop', 'mobile' ),
),
+ 'ext.echo.nojs.special' => $echoResourceTemplate + array(
+ 'position' => 'top',
+ 'styles' => array(
+ 'nojs/mw.echo.special.less',
+ ),
+ 'targets' => array( 'desktop', 'mobile' ),
+ ),
'ext.echo.special' => $echoResourceTemplate + array(
'scripts' => array(
'special/ext.echo.special.js',
diff --git a/includes/special/SpecialNotifications.php
b/includes/special/SpecialNotifications.php
index 50acbd5..7529167 100644
--- a/includes/special/SpecialNotifications.php
+++ b/includes/special/SpecialNotifications.php
@@ -134,7 +134,7 @@
)
);
// For no-js support
- $out->addModuleStyles( "ext.echo.nojs" );
+ $out->addModuleStyles( array( 'ext.echo.nojs',
'ext.echo.nojs.special' ) );
// Mark items as read
if ( $unread ) {
MWEchoNotifUser::newFromUser( $user )->markRead(
$unread );
--
To view, visit https://gerrit.wikimedia.org/r/238212
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4112c8b819127dea7c5e2117feedfeecf583ef1f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: wmf/1.26wmf22
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
