Merge "Use preventDefault instead of stopPropagation"

This commit is contained in:
jenkins-bot
2014-03-27 08:26:06 +00:00
committed by Gerrit Code Review

View File

@@ -397,6 +397,8 @@
$ulsTrigger.on( 'click', function ( e, eventParams ) { $ulsTrigger.on( 'click', function ( e, eventParams ) {
var languagesettings = $ulsTrigger.data( 'languagesettings' ); var languagesettings = $ulsTrigger.data( 'languagesettings' );
e.preventDefault();
if ( languagesettings ) { if ( languagesettings ) {
if ( !languagesettings.shown ) { if ( !languagesettings.shown ) {
mw.hook( 'mw.uls.settings.open' ).fire( eventParams && eventParams.source || 'personal' ); mw.hook( 'mw.uls.settings.open' ).fire( eventParams && eventParams.source || 'personal' );
@@ -407,14 +409,14 @@
$ulsTrigger.trigger( 'click', eventParams ); $ulsTrigger.trigger( 'click', eventParams );
} ); } );
e.stopPropagation();
} }
} ); } );
} else { } else {
$ulsTrigger.on( 'click', function ( e, eventParams ) { $ulsTrigger.on( 'click', function ( e, eventParams ) {
var uls = $ulsTrigger.data( 'uls' ); var uls = $ulsTrigger.data( 'uls' );
e.preventDefault();
if ( uls ) { if ( uls ) {
if ( !uls.shown ) { if ( !uls.shown ) {
mw.hook( 'mw.uls.settings.open' ).fire( eventParams && eventParams.source || 'personal' ); mw.hook( 'mw.uls.settings.open' ).fire( eventParams && eventParams.source || 'personal' );
@@ -445,8 +447,6 @@
window.setTimeout( function () { window.setTimeout( function () {
$ulsTrigger.trigger( 'click', eventParams ); $ulsTrigger.trigger( 'click', eventParams );
}, 0 ); }, 0 );
e.stopPropagation();
} ); } );
} }
} ); } );