Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2013-01-01 22:18:51 +01:00
commit 80137de04b
2 changed files with 30 additions and 4 deletions

View File

@ -3471,6 +3471,35 @@ function PMA_createqTip($elements, content, options)
$elements.qtip($.extend(true, o, options));
}
/**
* Create a jQuery UI tooltip
*
* @param $elements jQuery object representing the elements
* @param item the item
* (see http://api.jqueryui.com/tooltip/#option-items)
* @param myContent content of the tooltip
* @param additional_options to override the default options
*
*/
function PMA_tooltip($elements, item, myContent, additional_options)
{
if ($('#no_hint').length > 0) {
return;
}
var default_options = {
content: myContent,
items: item,
//@todo: when PMA_createqTip() is gone, rename this class
tooltipClass: "normalqTip",
track: true,
show: {effect: "slideDown", duration: 250},
hide: {effect: "slideUp", duration: 250}
}
$elements.tooltip($.extend(true, default_options, additional_options));
}
/**
* Return value of a cell in a table.
*/

View File

@ -17,10 +17,7 @@ AJAX.registerTeardown('server_status_variables.js', function() {
AJAX.registerOnload('server_status_variables.js', function() {
/*** Table sort tooltip ***/
PMA_createqTip(
$('table.sortable').children('thead').children('tr').has('th'),
PMA_messages['strSortHint']
);
PMA_tooltip($('table.sortable>thead>tr:first').find('th'), 'th', PMA_messages['strSortHint']);
initTableSorter('statustabs_allvars');
// Filters for status variables