From 3668109b2e7bf54a762ff52189f63a2845de476c Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Wed, 20 Mar 2024 12:47:09 +0100 Subject: [PATCH 1/4] Fix resize (#628) --- src/DebugBar/Resources/debugbar.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/DebugBar/Resources/debugbar.js b/src/DebugBar/Resources/debugbar.js index 55c7b9d..93756f8 100644 --- a/src/DebugBar/Resources/debugbar.js +++ b/src/DebugBar/Resources/debugbar.js @@ -449,8 +449,8 @@ if (typeof(PhpDebugBar) == 'undefined') { resize: function() { var contentSize = this.respCSSSize; if (this.respCSSSize == 0) { - this.$header.find("> div > *:visible").each(function () { - contentSize += $(this).outerWidth(); + this.$header.find("> *:visible").each(function () { + contentSize += $(this).outerWidth(true); }); } @@ -934,7 +934,7 @@ if (typeof(PhpDebugBar) == 'undefined') { if (!suffix || ('(iframe)').indexOf(suffix) < 0) { suffix = '(iframe)' + (suffix || ''); } - + window.parent.phpdebugbar.addDataSet(data, id, suffix, show); return; } @@ -1011,6 +1011,7 @@ if (typeof(PhpDebugBar) == 'undefined') { self.getControl(key).set('data', d); } }); + self.resize(); }, /** From 42beef04ff319d285ad40c5a036e45ab9b6b6367 Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Wed, 20 Mar 2024 13:35:26 +0100 Subject: [PATCH 2/4] Feat deprecate bindtojquery (#629) * Deprecate bindToJquery * Tweak --- src/DebugBar/JavascriptRenderer.php | 6 ++++-- src/DebugBar/Resources/debugbar.js | 5 +---- tests/DebugBar/Tests/full_init.html | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/DebugBar/JavascriptRenderer.php b/src/DebugBar/JavascriptRenderer.php index 9539630..f06c820 100644 --- a/src/DebugBar/JavascriptRenderer.php +++ b/src/DebugBar/JavascriptRenderer.php @@ -72,9 +72,9 @@ class JavascriptRenderer protected $ajaxHandlerBindToFetch = false; - protected $ajaxHandlerBindToJquery = true; + protected $ajaxHandlerBindToJquery = false; - protected $ajaxHandlerBindToXHR = false; + protected $ajaxHandlerBindToXHR = true; protected $ajaxHandlerAutoShow = true; @@ -509,6 +509,7 @@ class JavascriptRenderer * Sets whether to call bindToJquery() on the ajax handler * * @param boolean $bind + * @deprecated use setBindAjaxHandlerToXHR */ public function setBindAjaxHandlerToJquery($bind = true) { @@ -520,6 +521,7 @@ class JavascriptRenderer * Checks whether bindToJquery() will be called on the ajax handler * * @return boolean + * @deprecated use isAjaxHandlerBoundToXHR */ public function isAjaxHandlerBoundToJquery() { diff --git a/src/DebugBar/Resources/debugbar.js b/src/DebugBar/Resources/debugbar.js index 93756f8..f359350 100644 --- a/src/DebugBar/Resources/debugbar.js +++ b/src/DebugBar/Resources/debugbar.js @@ -1204,10 +1204,7 @@ if (typeof(PhpDebugBar) == 'undefined') { }, /** - * Attaches an event listener to jQuery.ajaxComplete() - * - * @this {AjaxHandler} - * @param {jQuery} jq Optional + * @deprecated use bindToXHR instead */ bindToJquery: function(jq) { var self = this; diff --git a/tests/DebugBar/Tests/full_init.html b/tests/DebugBar/Tests/full_init.html index ab749e6..0e14490 100644 --- a/tests/DebugBar/Tests/full_init.html +++ b/tests/DebugBar/Tests/full_init.html @@ -9,5 +9,5 @@ phpdebugbar.setDataMap({ }); phpdebugbar.restoreState(); phpdebugbar.ajaxHandler = new PhpDebugBar.AjaxHandler(phpdebugbar, undefined, true); -if (jQuery) phpdebugbar.ajaxHandler.bindToJquery(jQuery); +phpdebugbar.ajaxHandler.bindToXHR(); phpdebugbar.addDataSet( From 29c8b9c942a8500323a667e4447d1a1c1424ea29 Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Wed, 20 Mar 2024 13:35:41 +0100 Subject: [PATCH 3/4] Use fetch instead of jQuery ajax (#630) --- src/DebugBar/Resources/openhandler.js | 28 +++++++++++-------- src/DebugBar/Resources/widgets.js | 2 +- .../Resources/widgets/sqlqueries/widget.js | 2 +- .../Resources/widgets/templates/widget.js | 2 +- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/DebugBar/Resources/openhandler.js b/src/DebugBar/Resources/openhandler.js index 5633043..3fd11ce 100644 --- a/src/DebugBar/Resources/openhandler.js +++ b/src/DebugBar/Resources/openhandler.js @@ -58,7 +58,7 @@ if (typeof(PhpDebugBar) == 'undefined') { self.hide(); }); }); - + this.addSearch(); this.$overlay = $('
').addClass(csscls('overlay')).hide().appendTo('body'); @@ -72,7 +72,7 @@ if (typeof(PhpDebugBar) == 'undefined') { this.$loadmorebtn.show(); this.find({}, 0, this.handleFind.bind(this)); }, - + addSearch: function(){ var self = this; var searchBtn = $('