Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-05-22 09:41:39 +02:00
commit a4e887069a
2 changed files with 2 additions and 3 deletions

View File

@ -45,6 +45,7 @@ phpMyAdmin - ChangeLog
- bug #4893 Nav tree line alignment issue
- bug #4911 Lock page icon is not shown after fresh reload
- bug #4912 "Highlight pointer" and "Row marker" doesn't work properly
- bug Browse foreigners window goes out of the window
4.4.7.0 (2015-05-16)
- bug #4876 Settings issues (Favorite tables shown twice in Settings)

View File

@ -643,6 +643,7 @@ function browseForeignDialog($this_a)
$dialog = $('<div>').append(data.message).dialog({
title: PMA_messages.strBrowseForeignValues,
width: Math.min($(window).width() - 100, 700),
maxHeight: $(window).height() - 100,
dialogClass: 'browse_foreign_modal',
close: function (ev, ui) {
// remove event handlers attached to elements related to dialog
@ -652,9 +653,6 @@ function browseForeignDialog($this_a)
// remove dialog itself
$(this).remove();
},
create: function () {
$(this).css('maxHeight', $(window).height() - 100);
},
modal: true
});
}).done(function () {