[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1387-g5ea8761

[Michal Čihař]

The branch, master has been updated
       via  5ea8761692d2d9f23293f3cc335991976c299e36 (commit)
       via  00774b14057eac08e7bbb038871652df426387fe (commit)
       via  18b435fed88308f5564cd9c8f8099e6e3656fa32 (commit)
      from  06bcb3ecfdf915d17b3bae247b268a1282b2b5f3 (commit)


- Log -----------------------------------------------------------------
commit 5ea8761692d2d9f23293f3cc335991976c299e36
Author: Ruben Barkow <rubo77 at users.sourceforge.net>
Date:   Tue Apr 6 09:39:37 2010 +0200

    Add some more samples to config.sample.inc.php.
    
    rfe#2937840

commit 00774b14057eac08e7bbb038871652df426387fe
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Apr 6 09:32:36 2010 +0200

    Whitespace cleanup.

commit 18b435fed88308f5564cd9c8f8099e6e3656fa32
Author: Philip Frank <bananer at users.sourceforge.net>
Date:   Tue Apr 6 09:32:12 2010 +0200

    Use jQuery to bind click events on table rows
    
    Patch #2982132

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

Summary of changes:
 config.sample.inc.php |   66 +++++++++++++++++++++++++++++++++++++++++++-----
 js/functions.js       |    6 ++--
 2 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/config.sample.inc.php b/config.sample.inc.php
index f61b648..e044304 100644
--- a/config.sample.inc.php
+++ b/config.sample.inc.php
@@ -7,7 +7,6 @@
  * All directives are explained in Documentation.html and on phpMyAdmin
  * wiki <http://wiki.phpmyadmin.net>.
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 
@@ -70,31 +69,84 @@ $cfg['UploadDir'] = '';
 $cfg['SaveDir'] = '';
 
 /**
- * Defines whether a user should be displayed a "show all (records)" 
+ * Defines whether a user should be displayed a "show all (records)"
  * button in browse mode or not.
+ * default = false
  */
-//$cfg['ShowAll'] = false;
+//$cfg['ShowAll'] = true;
 
 /**
- * Number of rows displayed when browsing a result set. If the result 
+ * Number of rows displayed when browsing a result set. If the result
  * set contains more rows, "Previous" and "Next".
+ * default = 30
  */
-//$cfg['MaxRows'] = 30;
+//$cfg['MaxRows'] = 50;
 
 /**
  * Use graphically less intense menu tabs
+ * default = false
  */
-//$cfg['LightTabs'] = false;
+//$cfg['LightTabs'] = true;
+
+/**
+ * default for 'ORDER BY' clause (valid values are 'ASC', 'DESC' or 'SMART' -ie
+ * descending order for fields of type TIME, DATE, DATETIME & TIMESTAMP,
+ * ascending order else-)
+ * default = ASC
+ */
+//$cfg['Order'] = 'SMART';
+
+/**
+ * disallow editing of binary fields
+ * valid values are:
+ *   false  allow editing
+ *   'blob' allow editing except for BLOB fields
+ *   'all'  disallow editing
+ * default = blob
+ */
+//$cfg['ProtectBinary'] = 'false';
+
+/**
+ * Default language to use, if not browser-defined or user-defined
+ * (you find all languages in the file libraries/select_lang.lib.php)
+ * uncomment the desired line:
+ * default = 'en-utf-8'
+ */
+//$cfg['DefaultLang'] = 'en';
+//$cfg['DefaultLang'] = 'de';
+
+/**
+ * default display direction (horizontal|vertical|horizontalflipped)
+ */
+//$cfg['DefaultDisplay'] = 'vertical';
+
+
+/**
+ * How many columns should be used for table display of a database?
+ * (a value larger than 1 results in some information being hidden)
+ * default = 1
+ */
+//$cfg['PropertiesNumColumns'] = 2;
 
 /**
  * Set to true if you want DB-based query history.If false, this utilizes
  * JS-routines to display query history (lost by window close)
  *
  * This requires advanced features enabled, see above.
+ * default = false
+ */
+//$cfg['QueryHistoryDB'] = true;
+
+/**
+ * When using DB-based query history, how many entries should be kept?
+ *
+ * @global integer $cfg['QueryHistoryMax']
+ * default = 25
  */
-//$cfg['QueryHistoryDB'] = false;
+//$cfg['QueryHistoryMax'] = 100;
 
 /*
  * You can find more configuration options in Documentation.html
+ * or here: http://wiki.phpmyadmin.net/pma/Config
  */
 ?>
diff --git a/js/functions.js b/js/functions.js
index 5c577a7..6ea6ac7 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -833,14 +833,14 @@ function PMA_markRowsInit() {
             continue;
         }
         // ... and to mark the row on click ...
-        rows[i].onmousedown = function(event) {
+        $(rows[i]).bind('mousedown', function(event) {
             var unique_id;
             var checkbox;
             var table;
 
             // Somehow IE8 has this not set
             if (!event) var event = window.event
-			
+
             checkbox = this.getElementsByTagName( 'input' )[0];
             if ( checkbox && checkbox.type == 'checkbox' ) {
                 unique_id = checkbox.name + checkbox.value;
@@ -895,7 +895,7 @@ function PMA_markRowsInit() {
                     table.lastClicked = this.rowIndex;
                 }
             }
-        }
+        });
 
         // ... and disable label ...
         var labeltag = rows[i].getElementsByTagName('label')[0];


hooks/post-receive
-- 
phpMyAdmin