From 0d4d7e0b9b4fd2aa4482982238fa67b8e3c346db Mon Sep 17 00:00:00 2001
From: Victor Berchet <victor@suumit.com>
Date: Sun, 29 Jan 2012 11:47:22 +0100
Subject: [PATCH] [WebProfilerBundle] Make the toolbar use the common JS

---
 .../views/Profiler/toolbar_js.html.twig       | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
index 69aaafb476..cbd6b58479 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
@@ -1,23 +1,16 @@
 <div id="sfwdt{{ token }}" class="sf-toolbar" style="display: none"></div>
+{% include 'WebProfilerBundle:Profiler:base_js.html.twig' %}
 <script type="text/javascript">/*<![CDATA[*/
     (function () {
-        var wdt, xhr;
-        wdt = document.getElementById('sfwdt{{ token }}');
-        if (window.XMLHttpRequest) {
-            xhr = new XMLHttpRequest();
-        } else {
-            xhr = new ActiveXObject('Microsoft.XMLHTTP');
-        }
-        xhr.open('GET', '{{ path("_wdt", { "token": token }) }}', true);
-        xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
-        xhr.onreadystatechange = function(state) {
-            if (4 === xhr.readyState && 200 === xhr.status && -1 !== xhr.responseText.indexOf('sf-toolbarreset')) {
-                wdt.innerHTML = xhr.responseText;
-                wdt.style.display = 'block';
-            } else if (4 === xhr.readyState && xhr.status != 200) {
-                confirm('An error occurred while loading the web debug toolbar (' + xhr.status + ': ' + xhr.statusText + ').\n\nDo you want to open the profiler?') && (window.location = '{{ path("_profiler", { "token": token }) }}');
+        Sfjs.load(
+            '#sfwdt{{ token }}',
+            '{{ path("_wdt", { "token": token }) }}',
+            function(xhr, el) {
+                el.style.display = -1 !== xhr.responseText.indexOf('sf-toolbarreset') ? 'block' : 'none';
+            },
+            function(xhr) {
+                confirm('An error occurred while loading the web debug toolbar (' + xhr.status + ': ' + xhr.statusText + ').\n\nDo you want to open the profiler?') && (window.location = '{{ path("_profiler", { "token": token }) }}')
             }
-        };
-        xhr.send('');
+        );
     })();
 /*]]>*/</script>