Cleanup makegrid.js and do scoped selections

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>

1 files changed, 33 insertions, 30 deletions

diff --git a/js/makegrid.js b/js/makegrid.js
index 5154478567..01b1c1281b 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -247,7 +247,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             $(g.cRsz).find('div').hide();
             var $firstRowCols = $(g.t).find('tr:first th.draggable:visible');
             var $resizeHandles = $(g.cRsz).find('div').removeClass('condition');
-            $('table.pma_table').find('thead th:first').removeClass('before-condition');
+            $(g.t).find('table.pma_table').find('thead th:first').removeClass('before-condition');
             for (var n = 0, l = $firstRowCols.length; n < l; n++) {
                 var $col = $($firstRowCols[n]);
                 $($resizeHandles[n]).css('left', $col.position().left + $col.outerWidth(true))
@@ -260,7 +260,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                 }
             }
             if ($($resizeHandles[0]).hasClass('condition')) {
-                $('table.pma_table').find('thead th:first').addClass('before-condition');
+                $(g.t).find('thead th:first').addClass('before-condition');
             }
             $(g.cRsz).css('height', $(g.t).height());
         },
@@ -407,9 +407,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             var isOneColumn = g.visibleHeadersCount == 1;
             // enable or disable restore button
             if (isInitial || isOneColumn) {
-                $('div.restore_column').hide();
+                $(g.o).find('div.restore_column').hide();
             } else {
-                $('div.restore_column').show();
+                $(g.o).find('div.restore_column').show();
             }
         },
 
@@ -1064,7 +1064,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             /**
              * @var relational_display string 'K' if relational key, 'D' if relational display column
              */
-            var relational_display = $(t).find("input[name=relational_display]:checked").val();
+            var relational_display = $(g.o).find("input[name=relational_display]:checked").val();
             /**
              * @var transform_fields    Array containing the name/value pairs for transformed fields
              */
@@ -1092,7 +1092,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             /**
              * @var is_unique   Boolean, whether the rows in this table is unique or not
              */
-            var is_unique = $('td.edit_row_anchor').is('.nonunique') ? 0 : 1;
+            var is_unique = $(g.t).find('td.edit_row_anchor').is('.nonunique') ? 0 : 1;
             /**
              * multi edit variables
              */
@@ -1107,7 +1107,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             }
 
             // loop each edited row
-            $('td.to_be_saved').parents('tr').each(function () {
+            $(g.t).find('td.to_be_saved').parents('tr').each(function () {
                 var $tr = $(this);
                 var where_clause = $tr.find('.where_clause').val();
                 if (typeof where_clause === 'undefined') {
@@ -1136,7 +1136,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                      * @var field_name  String containing the name of this field.
                      * @see getFieldName()
                      */
-                    var field_name = getFieldName($(t), $this_field);
+                    var field_name = getFieldName($(g.t), $this_field);
 
                     /**
                      * @var this_field_params   Array temporary storage for the name/value of current field
@@ -1240,7 +1240,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                 $(g.cEdit).find('*').prop('disabled', true);
                 $(g.cEdit).find('.edit_box').addClass('edit_box_posting');
             } else {
-                $('div.save_edited').addClass('saving_edited_data')
+                $(g.o).find('div.save_edited').addClass('saving_edited_data')
                     .find('input').prop('disabled', true);    // disable the save button
             }
 
@@ -1255,14 +1255,14 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                             $(g.cEdit).find('*').removeProp('disabled');
                             $(g.cEdit).find('.edit_box').removeClass('edit_box_posting');
                         } else {
-                            $('div.save_edited').removeClass('saving_edited_data')
+                            $(g.o).find('div.save_edited').removeClass('saving_edited_data')
                                 .find('input').removeProp('disabled');  // enable the save button back
                         }
                         if (typeof data !== 'undefined' && data.success === true) {
                             PMA_ajaxShowMessage(data.message);
 
                             // update where_clause related data in each edited row
-                            $('td.to_be_saved').parents('tr').each(function () {
+                            $(g.t).find('td.to_be_saved').parents('tr').each(function () {
                                 var new_clause = $(this).data('new_clause');
                                 var $where_clause = $(this).find('.where_clause');
                                 var old_clause = $where_clause.val();
@@ -1301,7 +1301,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                                 var tools = $result_query.find('.tools').wrap('<p>').parent().html();
                                 // sqlOuter and tools will not be present if 'Show SQL queries' configuration is off
                                 if (typeof sqlOuter != 'undefined' && typeof tools != 'undefined') {
-                                    $existing_query = $(t).find('.result_query');
+                                    $existing_query = $(g.o).find('.result_query');
                                     // If two query box exists update query in second else add a second box
                                     if ($existing_query.find('div.sqlOuter').length > 1) {
                                         $existing_query.children(":nth-child(4)").remove();
@@ -1317,7 +1317,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                             g.hideEditCell(true, data);
 
                             // remove the "Save edited cells" button
-                            $('div.save_edited').hide();
+                            $(g.o).find('div.save_edited').hide();
                             // update saved fields
                             $(g.t).find('.to_be_saved')
                                 .removeClass('to_be_saved')
@@ -1352,7 +1352,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
              * @var field_name  String containing the name of this field.
              * @see getFieldName()
              */
-            var field_name = getFieldName($(t), $this_field);
+            var field_name = getFieldName($(g.t), $this_field);
 
             /**
              * @var this_field_params   Array temporary storage for the name/value of current field
@@ -1406,7 +1406,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                 $(g.currentEditCell).addClass('to_be_saved')
                     .data('value', this_field_params[field_name]);
                 if (g.saveCellsAtOnce) {
-                    $('div.save_edited').show();
+                    $(g.o).find('div.save_edited').show();
                 }
                 g.isCellEdited = true;
             }
@@ -1482,7 +1482,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             var $firstRowCols = $(g.t).find('tr:first th.draggable');
 
             // initialize column order
-            $col_order = $(t).find('.col_order');   // check if column order is passed from PHP
+            $col_order = $(g.o).find('.col_order');   // check if column order is passed from PHP
             if ($col_order.length > 0) {
                 g.colOrder = $col_order.val().split(',');
                 for (var i = 0; i < g.colOrder.length; i++) {
@@ -1496,9 +1496,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             }
 
             // register events
-            $(t).find('th.draggable')
+            $(g.t).find('th.draggable')
                 .mousedown(function (e) {
-                    $('#sqlqueryresults').addClass("turnOffSelect");
+                    $(g.o).addClass("turnOffSelect");
                     if (g.visibleHeadersCount > 1) {
                         g.dragStartReorder(e, this);
                     }
@@ -1533,12 +1533,12 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                     })
                     .find("input").focus().select();
                 });
-            $(t).find('th.draggable a')
+            $(g.t).find('th.draggable a')
                 .dblclick(function (e) {
                     e.stopPropagation();
                 });
             // restore column order when the restore button is clicked
-            $('div.restore_column').click(function () {
+            $(g.o).find('div.restore_column').click(function () {
                 g.restoreColOrder();
             });
 
@@ -1547,7 +1547,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             $(g.gDiv).append(g.cCpy);
 
             // prevent default "dragstart" event when dragging a link
-            $(t).find('th a').bind('dragstart', function () {
+            $(g.t).find('th a').bind('dragstart', function () {
                 return false;
             });
 
@@ -1576,7 +1576,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             var $firstRowCols = $(g.t).find('tr:first th.draggable');
 
             // initialize column visibility
-            var $col_visib = $(t).find('.col_visib');   // check if column visibility is passed from PHP
+            var $col_visib = $(g.o).find('.col_visib');   // check if column visibility is passed from PHP
             if ($col_visib.length > 0) {
                 g.colVisib = $col_visib.val().split(',');
                 for (var i = 0; i < g.colVisib.length; i++) {
@@ -1652,7 +1652,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             }
 
             // hide column visibility list if we move outside the list
-            $(t).find('td, th.draggable').mouseenter(function () {
+            $(g.t).find('td, th.draggable').mouseenter(function () {
                 g.hideColList();
             });
 
@@ -1701,11 +1701,11 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             g.showDataRowLinkText = PMA_messages.strShowDataRowLink;
 
             // initialize cell editing configuration
-            g.saveCellsAtOnce = $(t).find('.save_cells_at_once').val();
+            g.saveCellsAtOnce = $(g.o).find('.save_cells_at_once').val();
             g.maxTruncatedLen = PMA_commonParams.get('LimitChars');
 
             // register events
-            $(t).find('td.data.click1')
+            $(g.t).find('td.data.click1')
                 .click(function (e) {
                     startGridEditing(e, this);
                     // prevent default action when clicking on "link" in a table
@@ -1714,7 +1714,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                     }
                 });
 
-            $(t).find('td.data.click2')
+            $(g.t).find('td.data.click2')
                 .click(function (e) {
                     $cell = $(this);
                     // In the case of relational link, We want single click on the link
@@ -1804,7 +1804,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                     g.hideEditCell(true);
                 }
             });
-            $('div.save_edited').click(function () {
+            $(g.o).find('div.save_edited').click(function () {
                 g.hideEditCell();
                 g.postEditedCell();
             });
@@ -1843,6 +1843,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
     // initialize the table variable
     g.t = t;
 
+    // enclosing #sqlqueryresults div
+    g.o = $(t).parents('#sqlqueryresults');
+
     // get data columns in the first row of the table
     var $firstRowCols = $(t).find('tr:first th.draggable');
 
@@ -1867,7 +1870,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
     g.copyHint = PMA_messages.strColNameCopyHint;
 
     // assign common hidden inputs
-    var $common_hidden_inputs = $('div.common_hidden_inputs');
+    var $common_hidden_inputs = $(g.o).find('div.common_hidden_inputs');
     g.token = $common_hidden_inputs.find('input[name=token]').val();
     g.server = $common_hidden_inputs.find('input[name=server]').val();
     g.db = $common_hidden_inputs.find('input[name=db]').val();
@@ -1892,7 +1895,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
         g.initColResize();
     }
     if (enableReorder &&
-        $('table.navigation').length > 0)    // disable reordering for result from EXPLAIN or SHOW syntax, which do not have a table navigation panel
+        $(g.o).find('table.navigation').length > 0)    // disable reordering for result from EXPLAIN or SHOW syntax, which do not have a table navigation panel
     {
         g.initColReorder();
     }
@@ -1935,7 +1938,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             g.dragMove(e);
         });
         $(document).mouseup(function (e) {
-            $('#sqlqueryresults').removeClass("turnOffSelect");
+            $(g.o).removeClass("turnOffSelect");
             g.dragEnd(e);
         });
     }