[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21956-gf6dd17b

[Rouslan Placella]

The branch, master has been updated
       via  f6dd17bb94e041f0913dd594bf54f43662aa6b83 (commit)
       via  8812aeb7e25476313b9c07a90bebdf586a0dd443 (commit)
       via  2a14fdec556a78a5682f57625611831f381c63e2 (commit)
      from  00576dc1bb97e9f94a4658218e6957b2154c25f0 (commit)


- Log -----------------------------------------------------------------
commit f6dd17bb94e041f0913dd594bf54f43662aa6b83
Merge: 8812aeb 00576dc
Author: Rouslan Placella <rouslan at placella.com>
Date:   Mon Oct 31 18:48:16 2011 +0000

    Merge remote-tracking branch 'origin/master'

commit 8812aeb7e25476313b9c07a90bebdf586a0dd443
Author: Rouslan Placella <rouslan at placella.com>
Date:   Sun Oct 30 20:44:23 2011 +0000

    Fixed initialisation of makegrid in database search results

commit 2a14fdec556a78a5682f57625611831f381c63e2
Author: Rouslan Placella <rouslan at placella.com>
Date:   Sun Oct 30 20:41:35 2011 +0000

    Scroll to results after clicking "Browse" in database search

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

Summary of changes:
 db_search.php   |    1 +
 js/db_search.js |    6 +++++-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/db_search.php b/db_search.php
index da4863f..041242f 100644
--- a/db_search.php
+++ b/db_search.php
@@ -16,6 +16,7 @@ require_once './libraries/common.inc.php';
 $GLOBALS['js_include'][] = 'db_search.js';
 $GLOBALS['js_include'][] = 'sql.js';
 $GLOBALS['js_include'][] = 'makegrid.js';
+$GLOBALS['js_include'][] = 'jquery/timepicker.js';
 
 /**
  * Gets some core libraries and send headers
diff --git a/js/db_search.js b/js/db_search.js
index d6a42ff..d787290 100644
--- a/js/db_search.js
+++ b/js/db_search.js
@@ -37,11 +37,15 @@ function loadResult(result_path, table_name, link, ajaxEnable)
             $('#table-link').attr({"href" : 'sql.php?'+link }).text(table_name);
             var url = result_path + " #sqlqueryresults";
             $('#browse-results').load(url, null, function() {
+                $('html, body')
+                    .animate({
+                        scrollTop: $("#browse-results").offset().top
+                    }, 1000);
                 PMA_ajaxRemoveMessage($msg);
                 // because under db_search, window.parent.table is not defined yet,
                 // we assign it manually from #table-link
                 window.parent.table = $('#table-link').text().trim();
-                $('#table_results').makegrid();
+                PMA_makegrid($('#table_results')[0], true, true, true, true);
             }).show();
         } else {
             event.preventDefault();


hooks/post-receive
-- 
phpMyAdmin