jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.notification: Expose close method to hide a
Notification
......................................................................
mediawiki.notification: Expose close method to hide a Notification
Bug: 51338
Change-Id: Icd7fd1ac328094ddc2560d4804dd52fc85879867
---
M resources/mediawiki/mediawiki.notification.js
M resources/mediawiki/mediawiki.notify.js
2 files changed, 9 insertions(+), 6 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mediawiki/mediawiki.notification.js
b/resources/mediawiki/mediawiki.notification.js
index 70f639c..4ede809 100644
--- a/resources/mediawiki/mediawiki.notification.js
+++ b/resources/mediawiki/mediawiki.notification.js
@@ -426,6 +426,7 @@
* @param {HTMLElement|jQuery|mw.Message|string} message
* @param {Object} options The options to use for the
notification.
* See #defaults for details.
+ * @return {Object} Object with a close function to close the
notification
*/
notify: function ( message, options ) {
var notif;
@@ -438,6 +439,7 @@
} else {
preReadyNotifQueue.push( notif );
}
+ return { close: $.proxy( notif.close, notif ) };
},
/**
diff --git a/resources/mediawiki/mediawiki.notify.js
b/resources/mediawiki/mediawiki.notify.js
index 83d95b6..743d651 100644
--- a/resources/mediawiki/mediawiki.notify.js
+++ b/resources/mediawiki/mediawiki.notify.js
@@ -1,22 +1,23 @@
/**
* @class mw.plugin.notify
*/
-( function ( mw ) {
+( function ( mw, $ ) {
'use strict';
/**
* @see mw.notification#notify
* @param message
* @param options
+ * @return {jQuery.Promise}
*/
mw.notify = function ( message, options ) {
+ var d = $.Deferred();
// Don't bother loading the whole notification system if we
never use it.
mw.loader.using( 'mediawiki.notification', function () {
- // Don't bother calling mw.loader.using a second time
after we've already loaded mw.notification.
- mw.notify = mw.notification.notify;
// Call notify with the notification the user requested
of us.
- mw.notify( message, options );
- } );
+ d.resolve( mw.notification.notify( message, options ) );
+ }, d.reject );
+ return d.promise();
};
/**
@@ -24,4 +25,4 @@
* @mixins mw.plugin.notify
*/
-}( mediaWiki ) );
+}( mediaWiki, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/74407
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icd7fd1ac328094ddc2560d4804dd52fc85879867
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Daniel Friesen <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
