Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2013-01-07 22:53:43 +01:00
commit 06289de5e7

View File

@ -1558,14 +1558,6 @@ function PMA_ajaxShowMessage(message, timeout)
// and add a tooltip so that the users know that it can be removed
if (dismissable) {
$retval.addClass('dismissable').css('cursor', 'pointer');
/**
* @var tooltipOptions Options for "Dismiss notification" tooltip
* to remove any animation when showing and hiding
*/
var tooltipOptions = {
show: false,
hide: false
};
/**
* Add a tooltip to the notification to let the user know that (s)he
* can dismiss the ajax notification by clicking on it.
@ -1573,8 +1565,7 @@ function PMA_ajaxShowMessage(message, timeout)
PMA_tooltip(
$retval,
'span',
PMA_messages['strDismiss'],
tooltipOptions
PMA_messages['strDismiss']
);
}