Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5

2012-07-28 13:41:37 +02:00 · 2012-07-28 13:41:37 +02:00 · 02463255d6
commit 02463255d6
parent d57679696c a143b74067
2 changed files with 7 additions and 0 deletions
--- a/1
+++ b/1
@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog
 - bug #3527531 [interface] GC-maxlifetime warning incorrectly displayed
 - bug #3526916 [interface] Search fails with JS error when tooltips disabled
 - bug #3544366 [interface] Event comments not saved
+- bug #3549084 [edit] Can't enter date directly when editing inline

 3.5.2.0 (2012-07-07)
 - bug #3521416 [interface] JS error when editing index
--- a/js/makegrid.js
+++ b/js/makegrid.js
@ -976,6 +976,12 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                        $input_field.val('');
                    }
                    $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');
+
+                    // remove {cursor: 'pointer'} added inside timepicker.js
+                    $input_field.css('cursor', '');
+                    // make the cell editable, so one can can bypass the timepicker
+                    // and enter date/time value manually
+                    g.isEditCellTextEditable = true;
                } else {
                    g.isEditCellTextEditable = true;
                    // only append edit area hint if there is a null checkbox