wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-09-23 18:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Initialize notifications model outside of the widget"

Browse source
This commit is contained in:
jenkins-bot 2015-11-07 01:08:07 +00:00 committed by Gerrit Code Review
parent e7d03773ae 44c2afbfee
commit 03b7995d83
2 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
modules/ext.echo.init.js
View file

@ -53,10 +53,22 @@
// Load the ui
mw.loader.using( 'ext.echo.ui', function () {
var messageNotificationsModel, alertNotificationsModel;
// Load message button and popup if messages exist
if ( $existingMessageLink.length ) {
mw.echo.ui.messageWidget = new mw.echo.ui.NotificationBadgeWidget( {
type: 'message',
messageNotificationsModel = new mw.echo.dm.NotificationsModel(
new mw.echo.dm.APIHandler( {
type: 'message',
limit: 25,
userLang: mw.config.get( 'wgUserLanguage' ),
baseParams: mw.echo.apiCallParams
} ),
{
type: 'message'
}
);
mw.echo.ui.messageWidget = new mw.echo.ui.NotificationBadgeWidget( messageNotificationsModel, {
markReadWhenSeen: false,
numItems: numMessages,
hasUnseen: hasUnseenMessages,
@ -78,8 +90,18 @@
}
// Load alerts popup and button
mw.echo.ui.alertWidget = new mw.echo.ui.NotificationBadgeWidget( {
type: 'alert',
alertNotificationsModel = new mw.echo.dm.NotificationsModel(
new mw.echo.dm.APIHandler( {
type: 'alert',
limit: 25,
userLang: mw.config.get( 'wgUserLanguage' ),
baseParams: mw.echo.apiCallParams
} ),
{
type: 'alert'
}
);
mw.echo.ui.alertWidget = new mw.echo.ui.NotificationBadgeWidget( alertNotificationsModel, {
markReadWhenSeen: true,
numItems: numAlerts,
hasUnseen: hasUnseenAlerts,

22
modules/ooui/mw.echo.ui.NotificationBadgeWidget.js
View file

@ -6,8 +6,8 @@
* @extends OO.ui.ButtonWidget
*
* @constructor
* @param {mw.echo.dm.NotificationsModel} model Notifications view model
* @param {Object} [config] Configuration object
* @cfg {string} [type='alert'] Notification type 'alert' or 'message'
* @cfg {number} [numItems=0] How many items are in the button display
* @cfg {boolean} [hasUnseen=false] Whether there are unseen items
* @cfg {boolean} [markReadWhenSeen=false] Mark all notifications as read on open
@ -22,7 +22,7 @@
* } }
* @cfg {string} [href] URL the badge links to
*/
mw.echo.ui.NotificationBadgeWidget = function MwEchoUiNotificationBadgeButtonPopupWidget( config ) {
mw.echo.ui.NotificationBadgeWidget = function MwEchoUiNotificationBadgeButtonPopupWidget( model, config ) {
var buttonFlags, allNotificationsButton, preferencesButton, footerButtonGroupWidget, $footer;
config = config || {};
@ -34,7 +34,10 @@
// Mixin constructors
OO.ui.mixin.PendingElement.call( this, config );
this.type = config.type || 'alert';
// View model
this.notificationsModel = model;
this.type = this.notificationsModel.getType();
this.numItems = config.numItems || 0;
this.markReadWhenSeen = !!config.markReadWhenSeen;
this.badgeIcon = config.badgeIcon || {};
@ -57,19 +60,6 @@
href: config.href
} );
// View model
this.notificationsModel = new mw.echo.dm.NotificationsModel(
new mw.echo.dm.APIHandler( {
type: this.type,
limit: 25,
userLang: mw.config.get( 'wgUserLanguage' ),
baseParams: mw.echo.apiCallParams
} ),
{
type: this.type
}
);
// Notifications widget
this.notificationsWidget = new mw.echo.ui.NotificationsWidget(
this.notificationsModel,