From 18e4b30634ad681765d5bc39c5866d342084c074 Mon Sep 17 00:00:00 2001
From: Rahul Shirsat <rahul.shirsat@enterprisedb.com>
Date: Wed, 13 Jan 2021 11:05:46 +0530
Subject: [PATCH] Reverting fix for #4892, updated the RM with the workaround.

---
 docs/en_US/release_notes_4_30.rst                |  1 -
 web/pgadmin/tools/datagrid/static/js/datagrid.js | 15 ++-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/docs/en_US/release_notes_4_30.rst b/docs/en_US/release_notes_4_30.rst
index 166c2c77b..abc229c2a 100644
--- a/docs/en_US/release_notes_4_30.rst
+++ b/docs/en_US/release_notes_4_30.rst
@@ -20,7 +20,6 @@ Housekeeping
 Bug fixes
 *********
 
-| `Issue #4892 <https://redmine.postgresql.org/issues/4892>`_ -  Fixed an issue where pressing the back button will show another instance of the main page inside of the Query Tool tab.
 | `Issue #5282 <https://redmine.postgresql.org/issues/5282>`_ -  Added 'Count Rows' option to the partition sub tables.
 | `Issue #5488 <https://redmine.postgresql.org/issues/5488>`_ -  Improve the explain plan details by showing popup instead of tooltip on clicking of the specified node.
 | `Issue #5571 <https://redmine.postgresql.org/issues/5571>`_ -  Added support for expression in exclusion constraints.
diff --git a/web/pgadmin/tools/datagrid/static/js/datagrid.js b/web/pgadmin/tools/datagrid/static/js/datagrid.js
index 18cfb8cc2..a7d056683 100644
--- a/web/pgadmin/tools/datagrid/static/js/datagrid.js
+++ b/web/pgadmin/tools/datagrid/static/js/datagrid.js
@@ -299,7 +299,7 @@ define('pgadmin.datagrid', [
             ).set({'title': gettext('Rename Panel')});
           });
 
-          var openQueryToolURL = function(j, panel_url) {
+          var openQueryToolURL = function(j) {
             // add spinner element
             let $spinner_el =
               $(`<div class="pg-sp-container">
@@ -315,20 +315,9 @@ define('pgadmin.datagrid', [
               if (frameInitialized) {
                 clearInterval(init_poller_id);
                 var frame = $(j).data('embeddedFrame');
-
                 if (frame) {
                   frame.onLoaded(()=>{
                     $spinner_el.remove();
-                    // Fix for firefox backspace click causes pgadmin Inception - RM4892
-                    // start of code
-                    var current_browser = pgAdmin.Browser.get_browser();
-                    if (current_browser.name === 'Firefox') {
-                      frame.$iFrame[0].contentWindow.history.pushState(null, null, panel_url);
-                      frame.$iFrame[0].contentWindow.onpopstate = function () {
-                        frame.$iFrame[0].contentWindow.history.go(1);
-                      };
-                    }
-                    // end of code
                   });
                   frame.openHTML(queryToolForm);
                 }
@@ -336,7 +325,7 @@ define('pgadmin.datagrid', [
             }, 100);
           };
 
-          openQueryToolURL(queryToolPanel, panel_url);
+          openQueryToolURL(queryToolPanel);
         }
         return true;
       },