gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-05-17 07:34:24 +02:00
commit 78e5e4dbeb
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/functions.js
View File

@ -3553,7 +3553,7 @@ function PMA_getCellValue(td) {
*/
AJAX.registerTeardown('functions.js', function () {
$('a.themeselect').die('click');
$('.autosubmit').unbind('change');
$('.autosubmit').die('change');
$('a.take_theme').unbind('click');
});
@ -3573,7 +3573,7 @@ AJAX.registerOnload('functions.js', function () {
/**
* Automatic form submission on change.
*/
$('.autosubmit').change(function (e) {
$('.autosubmit').live('change', function (e) {
$(this).closest('form').submit();
});
@ -3880,4 +3880,4 @@ $('a.login-link').live('click', function (e) {
$(function () {
$(window).resize(DynamicBoxes);
});
})();
})();

5
libraries/sql.lib.php
View File

@ -527,6 +527,11 @@ function PMA_getHtmlForProfilingChart($url_query, $pma_token, $profiling_results
$profiling_table .= '</div>';
$profiling_table .= '<div id="profilingchart" style="display:none;">';
$profiling_table .= '</div>';
$profiling_table .= '<script type="text/javascript">';
$profiling_table .= 'if($.jqplot !== undefined && $.jqplot.PieRenderer !== undefined) {';
$profiling_table .= 'makeProfilingChart();';
$profiling_table .= '}';
$profiling_table .= '</script>';
$profiling_table .= '</fieldset>' . "\n";
return $profiling_table;