mirror_php/php-debugbar
1
0
Fork 0
mirror of https://github.com/maximebf/php-debugbar.git synced 2025-01-17 05:18:32 +01:00
Code Issues Releases Wiki Activity

Revert "keeps only the main debugbar functionality on iframes (#606)" (#613)

Browse Source 
This reverts commit b6113ae0e536dc3fe2a4bc8b8df53a84ae8427cc.
This commit is contained in:
Barry vd. Heuvel 2024-03-11 15:49:43 +01:00 committed by GitHub
parent d7b954be25
commit c7d2cfba15
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 1 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
demo/iframes/iframe1.php
View File

@ -1,13 +0,0 @@
<?php
include '../bootstrap.php';
$debugbarRenderer->setBaseUrl('../../src/DebugBar/Resources');
$debugbar['messages']->addMessage('I\'m a IFRAME');
render_demo_page(function() {
?>
<iframe src="iframe2.php" style="display:none;"></iframe>
<?php
});

9
demo/iframes/iframe2.php
View File

@ -1,9 +0,0 @@
<?php
include '../bootstrap.php';
$debugbarRenderer->setBaseUrl('../../src/DebugBar/Resources');
$debugbar['messages']->addMessage('I\'m a Deeper Hidden Iframe');
render_demo_page(function() {});

13
demo/iframes/index.php
View File

@ -1,13 +0,0 @@
<?php
include '../bootstrap.php';
$debugbarRenderer->setBaseUrl('../../src/DebugBar/Resources');
$debugbar['messages']->addMessage('Top Page(Main debugbar)');
render_demo_page(function() {
?>
<iframe src="iframe1.php" height="350" style="width:100%;"></iframe>
<?php
});

4
demo/index.php
View File

@ -31,10 +31,6 @@ render_demo_page(function() {
<li><a href="ajax.php" class="ajax">load ajax content</a></li> <li><a href="ajax.php" class="ajax">load ajax content</a></li>
<li><a href="ajax_exception.php" class="ajax">load ajax content with exception</a></li> <li><a href="ajax_exception.php" class="ajax">load ajax content with exception</a></li>
</ul> </ul>
<h2>IFRAMES</h2>
<ul>
<li><a href="iframes/index.php">load through iframes</a></li>
</ul>
<h2>Stack</h2> <h2>Stack</h2>
<ul> <ul>
<li><a href="stack.php">perform a redirect</a></li> <li><a href="stack.php">perform a redirect</a></li>

17
src/DebugBar/Resources/debugbar.js
View File

@ -424,7 +424,6 @@ if (typeof(PhpDebugBar) == 'undefined') {
this.activePanelName = null; this.activePanelName = null;
this.datesetTitleFormater = new DatasetTitleFormater(this); this.datesetTitleFormater = new DatasetTitleFormater(this);
this.options.bodyMarginBottomHeight = parseInt($('body').css('margin-bottom')); this.options.bodyMarginBottomHeight = parseInt($('body').css('margin-bottom'));
this.hasParent = window.parent && window.parent.phpdebugbar && window.parent.phpdebugbar != this;
this.registerResizeHandler(); this.registerResizeHandler();
}, },
@ -434,7 +433,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
* @this {DebugBar} * @this {DebugBar}
*/ */
registerResizeHandler: function() { registerResizeHandler: function() {
if (typeof this.resize.bind == 'undefined' || this.hasParent) return; if (typeof this.resize.bind == 'undefined') return;
var f = this.resize.bind(this); var f = this.resize.bind(this);
this.respCSSSize = 0; this.respCSSSize = 0;
@ -475,10 +474,6 @@ if (typeof(PhpDebugBar) == 'undefined') {
* @this {DebugBar} * @this {DebugBar}
*/ */
render: function() { render: function() {
if (this.hasParent) {
this.$el.hide();
}
var self = this; var self = this;
this.$el.appendTo('body'); this.$el.appendTo('body');
this.$dragCapture = $('<div />').addClass(csscls('drag-capture')).appendTo(this.$el); this.$dragCapture = $('<div />').addClass(csscls('drag-capture')).appendTo(this.$el);
@ -578,7 +573,6 @@ if (typeof(PhpDebugBar) == 'undefined') {
* @this {DebugBar} * @this {DebugBar}
*/ */
restoreState: function() { restoreState: function() {
if (this.hasParent) return;
// bar height // bar height
var height = localStorage.getItem('phpdebugbar-height'); var height = localStorage.getItem('phpdebugbar-height');
this.setHeight(height || this.$body.height()); this.setHeight(height || this.$body.height());
@ -929,15 +923,6 @@ if (typeof(PhpDebugBar) == 'undefined') {
* @return {String} Dataset's id * @return {String} Dataset's id
*/ */
addDataSet: function(data, id, suffix, show) { addDataSet: function(data, id, suffix, show) {
if (this.hasParent) {
if (!suffix || ('(iframe)').indexOf(suffix) < 0) {
suffix = '(iframe)' + (suffix || '');
}
window.parent.phpdebugbar.addDataSet(data, id, suffix, show);
return;
}
var label = this.datesetTitleFormater.format(id, data, suffix); var label = this.datesetTitleFormater.format(id, data, suffix);
id = id || (getObjectSize(this.datasets) + 1); id = id || (getObjectSize(this.datasets) + 1);
this.datasets[id] = data; this.datasets[id] = data;