From 8f7c381e72c35f4ecfb20ff272c1dc93c45d5562 Mon Sep 17 00:00:00 2001 From: erikn69 Date: Fri, 12 Apr 2024 12:13:55 -0500 Subject: [PATCH 1/2] fix `cross-origin` iframe and no parent debugbar --- src/DebugBar/Resources/debugbar.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/DebugBar/Resources/debugbar.js b/src/DebugBar/Resources/debugbar.js index 9780aaf8..30ad35db 100644 --- a/src/DebugBar/Resources/debugbar.js +++ b/src/DebugBar/Resources/debugbar.js @@ -425,7 +425,9 @@ if (typeof(PhpDebugBar) == 'undefined') { this.activeDatasetId = null; this.datesetTitleFormater = new DatasetTitleFormater(this); this.options.bodyMarginBottomHeight = parseInt($('body').css('margin-bottom')); - this.isIframe = window.self !== window.top; + try { + this.isIframe = window.self !== window.top && window.top.phpdebugbar; + } catch (error) {} this.registerResizeHandler(); }, From 4446d0eefb64db1a17aebda16a8ceb6b3cc3759f Mon Sep 17 00:00:00 2001 From: erikn69 Date: Mon, 13 May 2024 08:41:02 -0500 Subject: [PATCH 2/2] fix iframe flag default value --- src/DebugBar/Resources/debugbar.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/DebugBar/Resources/debugbar.js b/src/DebugBar/Resources/debugbar.js index 30ad35db..3b2e6067 100644 --- a/src/DebugBar/Resources/debugbar.js +++ b/src/DebugBar/Resources/debugbar.js @@ -427,7 +427,9 @@ if (typeof(PhpDebugBar) == 'undefined') { this.options.bodyMarginBottomHeight = parseInt($('body').css('margin-bottom')); try { this.isIframe = window.self !== window.top && window.top.phpdebugbar; - } catch (error) {} + } catch (error) { + this.isIframe = false; + } this.registerResizeHandler(); },