From 29c8b9c942a8500323a667e4447d1a1c1424ea29 Mon Sep 17 00:00:00 2001
From: "Barry vd. Heuvel" <barryvdh@gmail.com>
Date: Wed, 20 Mar 2024 13:35:41 +0100
Subject: [PATCH] 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 = $('<div />').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 = $('<button />')
@@ -113,7 +113,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
                        });
                        e.preventDefault();
                     });
-                    
+
                 var method = $('<a />')
                     .text(meta['method'])
                     .on('click', function(e) {
@@ -147,7 +147,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
                         self.find({uri: meta['uri']}, 0, self.handleFind.bind(self));
                         e.preventDefault();
                     });
-                    
+
                 $('<tr />')
                     .append('<td>' + meta['datetime'] + '</td>')
                     .append('<td>' + meta['method'] + '</td>')
@@ -188,13 +188,19 @@ if (typeof(PhpDebugBar) == 'undefined') {
         },
 
         ajax: function(data, callback) {
-            $.ajax({
-                dataType: 'json',
-                url: this.get('url'),
-                data: data,
-                success: callback,
-                ignoreDebugBarAjaxHandler: true
-            });
+            var url = this.get('url');
+            if (data) {
+                url = url + '?' + new URLSearchParams(data);
+            }
+
+            fetch(url, {
+                method: "GET",
+                headers: {
+                    "Accept": "application/json",
+                },
+            })
+                .then((data) => data.json())
+                .then(callback);
         }
 
     });
diff --git a/src/DebugBar/Resources/widgets.js b/src/DebugBar/Resources/widgets.js
index b9228b6..bd0e5c8 100644
--- a/src/DebugBar/Resources/widgets.js
+++ b/src/DebugBar/Resources/widgets.js
@@ -595,7 +595,7 @@ if (typeof(PhpDebugBar) == 'undefined') {
                     if (e.xdebug_link) {
                         if (e.xdebug_link.ajax) {
                             $('<a title="' + e.xdebug_link.url + '"></a>').on('click', function () {
-                                $.ajax(e.xdebug_link.url);
+                                fetch(e.xdebug_link.url);
                             }).addClass(csscls('editor-link')).appendTo(header);
                         } else {
                             $('<a href="' + e.xdebug_link.url + '"></a>').addClass(csscls('editor-link')).appendTo(header);
diff --git a/src/DebugBar/Resources/widgets/sqlqueries/widget.js b/src/DebugBar/Resources/widgets/sqlqueries/widget.js
index 0c7c8f5..d107f1b 100644
--- a/src/DebugBar/Resources/widgets/sqlqueries/widget.js
+++ b/src/DebugBar/Resources/widgets/sqlqueries/widget.js
@@ -130,7 +130,7 @@
                     var header = $('<span title="Filename" />').addClass(csscls('filename')).text(stmt.xdebug_link.filename + ( stmt.xdebug_link.line ? "#" + stmt.xdebug_link.line : ''));
                     if (stmt.xdebug_link.ajax) {
                         $('<a title="' + stmt.xdebug_link.url + '"></a>').on('click', function () {
-                            $.ajax(stmt.xdebug_link.url);
+                            fetch(stmt.xdebug_link.url);
                         }).addClass(csscls('editor-link')).appendTo(header);
                     } else {
                         $('<a href="' + stmt.xdebug_link.url + '"></a>').addClass(csscls('editor-link')).appendTo(header);
diff --git a/src/DebugBar/Resources/widgets/templates/widget.js b/src/DebugBar/Resources/widgets/templates/widget.js
index 2aeede6..4de3579 100644
--- a/src/DebugBar/Resources/widgets/templates/widget.js
+++ b/src/DebugBar/Resources/widgets/templates/widget.js
@@ -23,7 +23,7 @@
                     if (tpl.xdebug_link) {
                         if (tpl.xdebug_link.ajax) {
                             $('<a title="' + tpl.xdebug_link.url + '"></a>').on('click', function () {
-                                $.ajax(tpl.xdebug_link.url);
+                                fetch(tpl.xdebug_link.url);
                             }).addClass(csscls('editor-link')).appendTo(header);
                         } else {
                             $('<a href="' + tpl.xdebug_link.url + '"></a>').addClass(csscls('editor-link')).appendTo(header);