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 2014-02-24 22:14:45 +01:00
commit c5c76a9259
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -28,6 +28,7 @@ phpMyAdmin - ChangeLog
4.1.9.0 (not yet released)
- bug #4279 CTRL + up or down moves two fields (part one)
- bug #4294 output as text radio clickable for "OpenDocument Text" export
4.1.8.0 (2014-02-22)
- bug #4276 Login loop on session expiry

10
js/export.js
View File

@ -132,8 +132,8 @@ function toggle_save_to_file()
$("#ul_save_asfile > li> select").prop('disabled', true);
} else {
$("#ul_save_asfile > li").fadeTo('fast', 1);
$("#ul_save_asfile > li > input").removeProp('disabled');
$("#ul_save_asfile > li> select").removeProp('disabled');
$("#ul_save_asfile > li > input").prop('disabled', false);
$("#ul_save_asfile > li> select").prop('disabled', false);
}
}
@ -185,9 +185,13 @@ AJAX.registerOnload('export.js', function () {
var active_plugin = $("#plugins option:selected").val();
var force_file = $("#force_file_" + active_plugin).val();
if (force_file == "true") {
if ($("#radio_dump_asfile").prop('checked') !== true) {
$("#radio_dump_asfile").prop('checked', true);
toggle_save_to_file();
}
$("#radio_view_as_text").prop('disabled', true).parent().fadeTo('fast', 0.4);
} else {
$("#radio_view_as_text").removeProp('disabled').parent().fadeTo('fast', 1);
$("#radio_view_as_text").prop('disabled', false).parent().fadeTo('fast', 1);
}
});
});