From 9e2d349591d2aa8287e13f611d1fb29a90928b16 Mon Sep 17 00:00:00 2001 From: Ashesh Vashi Date: Wed, 13 Apr 2016 11:25:04 +0100 Subject: [PATCH] Improvements to frame management. --- web/pgadmin/browser/static/js/frame.js | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/web/pgadmin/browser/static/js/frame.js b/web/pgadmin/browser/static/js/frame.js index baf58705e..a9d6fec6c 100644 --- a/web/pgadmin/browser/static/js/frame.js +++ b/web/pgadmin/browser/static/js/frame.js @@ -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)) {