IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-01-27 16:57:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improvements to frame management.

Browse Source
This commit is contained in:
Ashesh Vashi 2016-04-13 11:25:04 +01:00 committed by Dave Page
parent dd5e86bcf4
commit 9e2d349591
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
web/pgadmin/browser/static/js/frame.js
View File

@ -39,10 +39,25 @@ function(_, pgAdmin) {
myPanel.layout().addItem($frameArea);
that.panel = myPanel;
var frame = new wcIFrame($frameArea, myPanel);
$(myPanel).data('frameInitialized', false);
$(myPanel).data('embeddedFrame', frame);
if (that.url != '') {
setTimeout(function() { frame.openURL(that.url); }, 500);
if (that.url != '' && that.url != 'about:blank') {
setTimeout(function() {
frame.openURL(that.url);
$(myPanel).data('frameInitialized', true);
pgBrowser.Events.trigger(
'pgadmin-browser:frame:urlloaded:' + that.name, frame,
that.url, self
);
}, 50);
} else {
frame.openURL('about:blank');
$(myPanel).data('frameInitialized', true);
pgBrowser.Events.trigger(
'pgadmin-browser:frame:urlloaded:' + that.name, frame,
that.url, self
);
}
if (that.events && _.isObject(that.events)) {