From 0741c616602141f2f2b5cf18641dd39d656adfac Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Tue, 2 Feb 2021 23:02:21 +0100
Subject: [PATCH] Fix #16609 - Remove left-overs of #16277

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 js/makegrid.js     | 2 --
 js/navigation.js   | 3 ---
 js/sql.js          | 1 -
 js/table/select.js | 2 +-
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/js/makegrid.js b/js/makegrid.js
index 25b6e61556..1e3c5b03f3 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -201,7 +201,6 @@ var makeGrid = function (t, enableResize, enableReorder, enableVisib, enableGrid
                 g.reposDrop();
                 g.colRsz = false;
                 $(g.cRsz).find('div').removeClass('colborder_active');
-                Sql.rearrangeStickyColumns($(t).prev('.sticky_columns'), $(t));
             } else if (g.colReorder) {
                 // shift columns
                 if (g.colReorder.newn !== g.colReorder.n) {
@@ -228,7 +227,6 @@ var makeGrid = function (t, enableResize, enableReorder, enableVisib, enableGrid
                 $(g.cPointer).css('visibility', 'hidden');
 
                 g.colReorder = false;
-                Sql.rearrangeStickyColumns($(t).prev('.sticky_columns'), $(t));
             }
             $(document.body).css('cursor', 'inherit').noSelect(false);
         },
diff --git a/js/navigation.js b/js/navigation.js
index 697f99e573..b48214ea50 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -1302,9 +1302,6 @@ Navigation.ResizeHandler = function () {
             var pos = event.data.resize_handler.getPos(event);
             event.data.resize_handler.setWidth(pos);
         }
-        if ($('.sticky_columns').length !== 0) {
-            Sql.handleAllStickyColumns();
-        }
     };
     /**
      * Event handler for collapsing the panel
diff --git a/js/sql.js b/js/sql.js
index 50665c6224..d39fac5b42 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -184,7 +184,6 @@ AJAX.registerTeardown('sql.js', function () {
     $(document).off('submit', '.bookmarkQueryForm');
     $('input#bkm_label').off('input');
     $(document).off('makegrid', '.sqlqueryresults');
-    $(document).off('stickycolumns', '.sqlqueryresults');
     $('#togglequerybox').off('click');
     $(document).off('click', '#button_submit_query');
     $(document).off('change', '#id_bookmark');
diff --git a/js/table/select.js b/js/table/select.js
index a16549e884..6da77c6f8e 100644
--- a/js/table/select.js
+++ b/js/table/select.js
@@ -161,7 +161,7 @@ AJAX.registerOnload('table/select.js', function () {
                     $('#sqlqueryresultsouter').html(data.sql_query);
                 } else { // results found
                     $('#sqlqueryresultsouter').html(data.message);
-                    $('.sqlqueryresults').trigger('makegrid').trigger('stickycolumns');
+                    $('.sqlqueryresults').trigger('makegrid');
                 }
                 $('#tbl_search_form')
                     // workaround for bug #3168569 - Issue on toggling the "Hide search criteria" in chrome.