wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-24 16:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "ext.echo.overlay: Unbreak removal logic"

Browse source
This commit is contained in:
jenkins-bot 2013-11-10 02:46:46 +00:00 committed by Gerrit Code Review
parent 1829d6b510 be1cbc4e60
commit 4b4e955ae7
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
modules/overlay/ext.echo.overlay.js
View file

@ -21,6 +21,12 @@
configuration: mw.config.get( 'wgEchoOverlayConfiguration' ), configuration: mw.config.get( 'wgEchoOverlayConfiguration' ),
removeOverlay: function () {
$( '.mw-echo-overlay, .mw-echo-overlay-pokey' ).fadeOut( 'fast',
function () { $( this ).remove(); }
);
},
buildOverlay: function ( callback ) { buildOverlay: function ( callback ) {
var notificationLimit, var notificationLimit,
$overlay = $( '<div>' ).addClass( 'mw-echo-overlay' ), $overlay = $( '<div>' ).addClass( 'mw-echo-overlay' ),
@ -264,7 +270,7 @@
} }
$link.click( function ( e ) { $link.click( function ( e ) {
var $target, $overlay; var $target;
e.preventDefault(); e.preventDefault();
@ -272,20 +278,13 @@
mw.echo.logInteraction( 'ui-badge-link-click' ); mw.echo.logInteraction( 'ui-badge-link-click' );
$target = $( e.target ); $target = $( e.target );
// If the user clicked on the overlay or any child, // If the user clicked on the overlay or any child, ignore the click
// ignore the click if ( $target.hasClass( 'mw-echo-overlay' ) || $target.is( '.mw-echo-overlay *' ) ) {
if ( $target.hasClass( 'mw-echo-overlay' ) ||
$target.is( 'mw-echo-overlay *' )
) {
return; return;
} }
$overlay = $( '.mw-echo-overlay' ); if ( $( '.mw-echo-overlay' ).length ) {
mw.echo.overlay.removeOverlay();
if ( $overlay.length ) {
$overlay.fadeOut( 'fast',
function () { $overlay.remove(); }
);
return; return;
} }
@ -307,10 +306,8 @@
} ); } );
$( 'body' ).click( function ( e ) { $( 'body' ).click( function ( e ) {
if ( ! $( e.target ).is( '.mw-echo-overlay, .mw-echo-overlay *, .mw-echo-overlay-pokey' ) ) { if ( ! $( e.target ).is( '.mw-echo-overlay, .mw-echo-overlay *, .mw-echo-overlay-pokey, #pt-notifications a' ) ) {
$( '.mw-echo-overlay, .mw-echo-overlay-pokey' ).fadeOut( 'fast', mw.echo.overlay.removeOverlay();
function () { $( this ).remove(); }
);
} }
} ); } );
} ); } );