The branch, master has been updated via 4b75560c3b08ccdaff7cf427e747d83a6ff3ca54 (commit) via bcedd1c97a4776b3bc0b76cfee1f0a11f2fdebdc (commit) from 6286494b91e9ef291db697715b6ae4f96146b7a1 (commit)

- Log ----------------------------------------------------------------- commit 4b75560c3b08ccdaff7cf427e747d83a6ff3ca54 Author: Rouslan Placella rouslan@placella.com Date: Wed Jun 22 12:51:16 2011 +0100

Fixed changelog (bugfixes for 3.4.4, were filed under 3.4.3)

commit bcedd1c97a4776b3bc0b76cfee1f0a11f2fdebdc Author: Rouslan Placella rouslan@placella.com Date: Wed Jun 22 12:49:21 2011 +0100

Fixed jumpy animation in PMA_slidingMessage()

-----------------------------------------------------------------------

Summary of changes: ChangeLog | 4 ++-- js/functions.js | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 85b66b8..16c8f88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,8 @@ phpMyAdmin - ChangeLog + [display] GIS data visualization

3.4.4.0 (not yet released) +- bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes +- bug #3323101 [parser] Invalid escape sequence in SQL parser

3.4.3.0 (not yet released) - bug #3311170 [sync] Missing helper icons in Synchronize @@ -42,8 +44,6 @@ phpMyAdmin - ChangeLog - bug #3317293 [edit] Inline edit places HTML line breaks in edit area - bug #3319466 [interface] Inline query edit does not escape special characters - minor XSS (require a valid token) -- bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes -- bug #3323101 [parser] Invalid escape sequence in SQL parser

3.4.2.0 (2011-06-07) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/js/functions.js b/js/functions.js index f0966d0..436805c 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2468,7 +2468,8 @@ function PMA_slidingMessage(msg, $obj) { // we might have to create a new DOM node. if ($('#PMA_slidingMessage').length == 0) { $('#topmenucontainer') - .after('<span id="PMA_slidingMessage"></span>'); + .after('<span id="PMA_slidingMessage" ' + + 'style="display: inline-block;"></span>'); } $obj = $('#PMA_slidingMessage'); } @@ -2494,12 +2495,20 @@ function PMA_slidingMessage(msg, $obj) { } else { // Object does not already have a message // inside it, so we simply slide it down + var h = $obj + .width('100%') + .html('<div style="display: none;">' + msg + '</div>') + .find('div') + .first() + .height(); $obj - .width('100%') - .html('<div style="display: none;">' + msg + '</div>') .find('div') .first() - .slideDown(function() { + .css('height', 0) + .show() + .animate({ + height: h + }, function() { // Set the height of the parent // to the height of the child $obj

hooks/post-receive