From 9bfd54dc0b466c996dae79f1f0fd9dce437cbdea Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Sat, 4 Mar 2017 11:57:55 +0100 Subject: [PATCH 1/5] [WebProfilerBundle] Fix AJAX toolbar regressions --- .../Resources/views/Profiler/base_js.html.twig | 1 - .../Resources/views/Profiler/toolbar_js.html.twig | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) 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 ca69e371df28..4db86092e765 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 @@ -498,7 +498,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 cade08339b27..4bf866bcda5c 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) { From df7a759ae339673ca105d2c12ef8818cd098991a Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Sat, 4 Mar 2017 12:00:20 +0100 Subject: [PATCH 2/5] avoid double used class + remove unnecessary class assignments --- .../WebProfilerBundle/Resources/views/Collector/ajax.html.twig | 2 +- .../Resources/views/Profiler/base_js.html.twig | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) 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 fce25a7f26e1..5df0d9ea9bd0 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 4db86092e765..0b8071119324 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,12 +88,11 @@ 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) { From 86ff7a7734183103c7444cc26fae1b84445d1d94 Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Sat, 4 Mar 2017 12:01:14 +0100 Subject: [PATCH 3/5] use english pluralization --- .../Resources/views/Profiler/base_js.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0b8071119324..53108af26e1f 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 @@ -96,7 +96,7 @@ 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'); From d204c7ca8e1299855ca54950b9ab4dffeb56304f Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Sat, 4 Mar 2017 12:02:38 +0100 Subject: [PATCH 4/5] consistent default cell contents --- .../Resources/views/Profiler/base_js.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 53108af26e1f..2fcbb9332e1b 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 @@ -137,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); @@ -156,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'); From 76c18fdf593aee24c976f3ec5967c94e7ed14dad Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Sat, 4 Mar 2017 12:09:28 +0100 Subject: [PATCH 5/5] fixed unavailable response regression --- .../Resources/views/Profiler/base_js.html.twig | 3 +++ 1 file changed, 3 insertions(+) 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 2fcbb9332e1b..b87284c5afaf 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 @@ -198,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) { @@ -270,6 +272,7 @@ finishAjaxRequest(idx); }, function (e){ stackElement.error = true; + finishAjaxRequest(idx); }); startAjaxRequest(idx); }