From eabe018a9e1d6b6a8f9e352105b0ac9a59aa5823 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Sat, 10 Sep 2011 19:27:04 +0530
Subject: [PATCH 1/2] bug #3403282 [AJAX] Grid editor does not work for ENUM
 fields

---
 js/makegrid.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/js/makegrid.js b/js/makegrid.js
index c1b796ad68..d0befa12de 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -814,6 +814,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                         $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');
                     }) // end $.post()
 
+                    $editArea.show();
                     $editArea.find('select').live('change', function(e) {
                         $(g.cEdit).find('.edit_box').val($(this).val());
                     })
@@ -842,6 +843,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                         $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');
                     }) // end $.post()
 
+                    $editArea.show();
                     $editArea.find('select').live('change', function(e) {
                         $(g.cEdit).find('.edit_box').val($(this).val());
                     })
@@ -871,6 +873,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                         $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');
                     }) // end $.post()
 
+                    $editArea.show();
                     $editArea.find('select').live('change', function(e) {
                         $(g.cEdit).find('.edit_box').val($(this).val());
                     })
@@ -935,6 +938,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                                 PMA_ajaxShowMessage(data.error);
                             }
                         }) // end $.post()
+                        $editArea.show();
                     }
                     g.isEditCellTextEditable = true;
                 } else if ($td.is('.datefield, .datetimefield, .timestampfield')) {

From 5fd403f3267c7945c121fb74b1251be25d44937e Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Sat, 10 Sep 2011 19:31:30 +0530
Subject: [PATCH 2/2] Adding missing semicolons

---
 js/makegrid.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/js/makegrid.js b/js/makegrid.js
index d0befa12de..d87b7b44b8 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -797,7 +797,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                         'token' : g.token,
                         'curr_value' : relation_curr_value,
                         'relation_key_or_display_column' : relation_key_or_display_column
-                    }
+                    };
 
                     g.lastXHR = $.post('sql.php', post_params, function(data) {
                         g.lastXHR = null;
@@ -812,12 +812,12 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
 
                         $editArea.append(data.dropdown);
                         $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');
-                    }) // end $.post()
+                    }); // end $.post()
 
                     $editArea.show();
                     $editArea.find('select').live('change', function(e) {
                         $(g.cEdit).find('.edit_box').val($(this).val());
-                    })
+                    });
                 }
                 else if($td.is('.enum')) {
                     //handle enum fields
@@ -835,18 +835,18 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                             'column' : field_name,
                             'token' : g.token,
                             'curr_value' : curr_value
-                    }
+                    };
                     g.lastXHR = $.post('sql.php', post_params, function(data) {
                         g.lastXHR = null;
                         $editArea.removeClass('edit_area_loading');
                         $editArea.append(data.dropdown);
                         $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');
-                    }) // end $.post()
+                    }); // end $.post()
 
                     $editArea.show();
                     $editArea.find('select').live('change', function(e) {
                         $(g.cEdit).find('.edit_box').val($(this).val());
-                    })
+                    });
                 }
                 else if($td.is('.set')) {
                     //handle set fields
@@ -864,19 +864,19 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                             'column' : field_name,
                             'token' : g.token,
                             'curr_value' : curr_value
-                    }
+                    };
 
                     g.lastXHR = $.post('sql.php', post_params, function(data) {
                         g.lastXHR = null;
                         $editArea.removeClass('edit_area_loading');
                         $editArea.append(data.select);
                         $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');
-                    }) // end $.post()
+                    }); // end $.post()
 
                     $editArea.show();
                     $editArea.find('select').live('change', function(e) {
                         $(g.cEdit).find('.edit_box').val($(this).val());
-                    })
+                    });
                 }
                 else if($td.is('.truncated, .transformed')) {
                     if ($td.is('.to_be_saved')) {   // cell has been edited
@@ -937,7 +937,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                             else {
                                 PMA_ajaxShowMessage(data.error);
                             }
-                        }) // end $.post()
+                        }); // end $.post()
                         $editArea.show();
                     }
                     g.isEditCellTextEditable = true;
@@ -1242,7 +1242,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                             PMA_ajaxShowMessage(data.error);
                         }
                     }
-            }) // end $.ajax()
+            }); // end $.ajax()
         },
 
         /**
@@ -1629,7 +1629,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             // add hint for grid editing feature when hovering "Edit" link in each table row
             PMA_createqTip($(g.t).find('.edit_row_anchor a'), PMA_messages['strGridEditFeatureHint']);
         }
-    }
+    };
 
     /******************
      * Initialize grid