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

Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5

Browse Source
This commit is contained in:
Michal Čihař 2012-04-11 23:35:55 +02:00
commit 313acb84d3
3 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -13,6 +13,8 @@ phpMyAdmin - ChangeLog
- bug #3516183 [display] Missing image extension
- bug [display] Added missing icons in original theme
- bug #3516761 [edit] Query error after search
- bug #3516405 [display] Chart title is getting wrong within chart export
- bug #3517021 [interface] Header links except 'More' hide after closing dialog
3.5.0.0 (2012-04-07)
+ rfe #2021981 [interface] Add support for mass prefix change.

28
js/functions.js
View File

@ -1441,20 +1441,24 @@ function PMA_showNoticeForEnum(selectElement)
function PMA_createTableDialog( $div, url , target)
{
/**
* @var button_options Object that stores the options passed to jQueryUI
* dialog
*/
* @var button_options Object that stores the options passed to jQueryUI
* dialog
*/
var button_options = {};
// in the following function we need to use $(this)
button_options[PMA_messages['strCancel']] = function() {$(this).closest('.ui-dialog-content').dialog('close').remove();}
button_options[PMA_messages['strCancel']] = function() {
$(this).closest('.ui-dialog-content').dialog('close').remove();
};
var button_options_error = {};
button_options_error[PMA_messages['strOK']] = function() {$(this).closest('.ui-dialog-content').dialog('close').remove();}
button_options_error[PMA_messages['strOK']] = function() {
$(this).closest('.ui-dialog-content').dialog('close').remove();
};
var $msgbox = PMA_ajaxShowMessage();
$.get( target , url , function(data) {
//in the case of an error, show the error message returned.
$.get(target, url, function(data) {
//in the case of an error, show the error message returned.
if (data.success != undefined && data.success == false) {
$div
.append(data.error)
@ -1466,7 +1470,8 @@ function PMA_createTableDialog( $div, url , target)
})// end dialog options
//remove the redundant [Back] link in the error message.
.find('fieldset').remove();
} else {
}
else {
var size = getWindowSize();
var timeout;
$div
@ -1515,12 +1520,15 @@ function PMA_createTableDialog( $div, url , target)
close: function() {
$(window).unbind('resize.dialog-resizer');
$('#content-hide > *').unwrap();
// resize topmenu
menuResize();
menuResize(); // somehow need to call it twice to work
},
buttons: button_options
}); // end dialog options
}
PMA_convertFootnotesToTooltips($div);
PMA_ajaxRemoveMessage($msgbox);
PMA_convertFootnotesToTooltips($div);
PMA_ajaxRemoveMessage($msgbox);
}); // end $.get()
}

9
js/tbl_chart.js
View File

@ -1,6 +1,7 @@
var chart_xaxis_idx = -1;
var chart_series;
var chart_series_index = -1;
var temp_chart_title;
$(document).ready(function() {
var currentChart = null;
@ -66,11 +67,19 @@ $(document).ready(function() {
drawChart();
});
$('input[name="chartTitle"]').focus(function() {
temp_chart_title = $(this).val();
});
$('input[name="chartTitle"]').keyup(function() {
var title = $(this).attr('value');
if(title.length == 0) title = ' ';
currentChart.setTitle({ text: title });
});
$('input[name="chartTitle"]').blur(function() {
if ($(this).val() != temp_chart_title) {
drawChart(true);
}
});
$('select[name="chartXAxis"]').change(function() {
chart_xaxis_idx = this.value;