diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/ajax.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/ajax.html.twig index fce25a7f26e1c..5df0d9ea9bd0f 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/ajax.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/ajax.html.twig @@ -3,7 +3,7 @@ {% block toolbar %} {% set icon %} {{ include('@WebProfiler/Icon/ajax.svg') }} - 0 + 0 {% endset %} {% set text %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig index ca69e371df281..b87284c5afaf6 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig @@ -88,16 +88,15 @@ var successStreak = 4; var pendingRequests = 0; var renderAjaxRequests = function() { - var requestCounter = document.querySelector('.sf-toolbar-ajax-requests'); + var requestCounter = document.querySelector('.sf-toolbar-ajax-request-counter'); if (!requestCounter) { return; } requestCounter.textContent = requestStack.length; - requestCounter.className = 'sf-toolbar-ajax-requests sf-toolbar-value'; var infoSpan = document.querySelector(".sf-toolbar-ajax-info"); if (infoSpan) { - infoSpan.textContent = requestStack.length + ' AJAX request' + (requestStack.length > 1 ? 's' : ''); + infoSpan.textContent = requestStack.length + ' AJAX request' + (requestStack.length !== 1 ? 's' : ''); } var ajaxToolbarPanel = document.querySelector('.sf-toolbar-block-ajax'); @@ -138,7 +137,7 @@ var statusCodeCell = document.createElement('td'); var statusCode = document.createElement('span'); - statusCode.textContent = '-'; + statusCode.textContent = 'n/a'; statusCodeCell.appendChild(statusCode); row.appendChild(statusCodeCell); @@ -157,7 +156,7 @@ var durationCell = document.createElement('td'); durationCell.className = 'sf-ajax-request-duration'; - durationCell.textContent = '-'; + durationCell.textContent = 'n/a'; row.appendChild(durationCell); var profilerCell = document.createElement('td'); @@ -199,6 +198,8 @@ statusCodeElem.setAttribute('class', 'sf-toolbar-status sf-toolbar-status-red'); } statusCodeElem.textContent = request.statusCode; + } else { + statusCodeElem.setAttribute('class', 'sf-toolbar-status sf-toolbar-status-red'); } if (request.duration) { @@ -271,6 +272,7 @@ finishAjaxRequest(idx); }, function (e){ stackElement.error = true; + finishAjaxRequest(idx); }); startAjaxRequest(idx); } @@ -498,7 +500,6 @@ Sfjs.addEventListener(window, 'load', function() { Sfjs.createTabs(); Sfjs.createToggles(); - Sfjs.renderAjaxRequests(); }); /*]]>*/ 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 cade08339b270..4bf866bcda5cf 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 @@ -88,7 +88,8 @@ } Sfjs.setPreference('toolbar/displayState', 'block'); - }) + }); + Sfjs.renderAjaxRequests(); }, function(xhr) { if (xhr.status !== 0) {