[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15700-g84cc783

[Piotr Przybylski]

The branch, master has been updated
       via  84cc7837f5da69c588f7503da0acc9512ff29619 (commit)
      from  24ffd3e1d30bb5ccb08cfcf7bce118fc11bbd65f (commit)


- Log -----------------------------------------------------------------
commit 84cc7837f5da69c588f7503da0acc9512ff29619
Author: Piotr Przybylski <piotrprz at gmail.com>
Date:   Thu Aug 18 13:39:06 2011 +0200

    Use PMA_addDatepicker only when $.datetimepicker is defined, prevents JS error on server status page where timepicker.js is loaded on demand

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

Summary of changes:
 js/functions.js |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index 11e264e..54a08d5 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -685,10 +685,12 @@ $(document).ready(function() {
     /**
      * Add a date/time picker to each element that needs it
      */
-    $('.datefield, .datetimefield').each(function() {
-        PMA_addDatepicker($(this));
-        });
-})
+    if ($.datetimepicker != undefined) {
+        $('.datefield, .datetimefield').each(function() {
+            PMA_addDatepicker($(this));
+            });
+    }
+});
 
 /**
  * True if last click is to check a row.


hooks/post-receive
-- 
phpMyAdmin