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

Dialog Help was broken in case where query tool/Debugger opens in new browser tab. Fixes #2310

Browse Source
This commit is contained in:
Murtuza Zabuawala 2017-03-31 16:08:05 +05:30 committed by Akshay Joshi
parent 8005b05292
commit 08ff9d7422
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
web/pgadmin/browser/templates/browser/js/browser.js
View File

@ -705,20 +705,27 @@ function(require, $, _, S, Bootstrap, pgAdmin, Alertify, CodeMirror) {
pnlSqlHelp.focus(); pnlSqlHelp.focus();
iframe.openURL(fullUrl); iframe.openURL(fullUrl);
} else if(type == "dialog_help") { } else if(type == "dialog_help") {
// See if we can find an existing panel, if not, create one if(this.docker) {
pnlDialogHelp = this.docker.findPanels('pnl_online_help')[0]; // See if we can find an existing panel, if not, create one
if (pnlDialogHelp == null) {
pnlProperties = this.docker.findPanels('properties')[0];
this.docker.addPanel('pnl_online_help', wcDocker.DOCK.STACKED, pnlProperties);
pnlDialogHelp = this.docker.findPanels('pnl_online_help')[0]; pnlDialogHelp = this.docker.findPanels('pnl_online_help')[0];
if (pnlDialogHelp == null) {
pnlProperties = this.docker.findPanels('properties')[0];
this.docker.addPanel('pnl_online_help', wcDocker.DOCK.STACKED, pnlProperties);
pnlDialogHelp = this.docker.findPanels('pnl_online_help')[0];
}
// Update the panel
iframe = $(pnlDialogHelp).data('embeddedFrame');
pnlDialogHelp.focus();
iframe.openURL(url);
} else {
// We have added new functionality of opening Query tool & debugger in new
// browser tab, In that case we will not have docker object available
// so we will open dialog help in new browser tab
window.open(url, '_blank');
} }
// Update the panel
iframe = $(pnlDialogHelp).data('embeddedFrame');
pnlDialogHelp.focus();
iframe.openURL(url);
} }
}, },