IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reverting fix for #4892, updated the RM with the workaround.

Browse Source
This commit is contained in:
Rahul Shirsat
2021-01-13 11:05:46 +05:30
committed by Akshay Joshi
parent 6589f82e77
commit 18e4b30634
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
web/pgadmin/tools/datagrid/static/js/datagrid.js
View File

@@ -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;
},