From 4f53b1ddef303cd792cb91861222d90d7a4daef7 Mon Sep 17 00:00:00 2001 From: Tiago Melo Date: Thu, 13 Aug 2020 11:38:15 +0000 Subject: [PATCH] mgr/dashboard: Fix favicon white circle A white circle was displayed when the user logged out. Fixes: https://tracker.ceph.com/issues/46919 Signed-off-by: Tiago Melo --- .../app/shared/services/favicon.service.ts | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/favicon.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/favicon.service.ts index e9847ca06fe32..adec0664f406f 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/services/favicon.service.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/services/favicon.service.ts @@ -48,19 +48,22 @@ export class FaviconService implements OnDestroy { // Draw Original Favicon as Background context.drawImage(img, 0, 0, faviconSize, faviconSize); - // Cut notification circle area - context.save(); - context.globalCompositeOperation = 'destination-out'; - context.beginPath(); - context.arc(canvas.width - radius, radius, radius + 2, 0, 2 * Math.PI); - context.fill(); - context.restore(); - - // Draw Notification Circle - context.beginPath(); - context.arc(canvas.width - radius, radius, radius, 0, 2 * Math.PI); - context.fillStyle = Color[status] || 'transparent'; - context.fill(); + if (Color[status]) { + // Cut notification circle area + context.save(); + context.globalCompositeOperation = 'destination-out'; + context.beginPath(); + context.arc(canvas.width - radius, radius, radius + 2, 0, 2 * Math.PI); + context.fill(); + context.restore(); + + // Draw Notification Circle + context.beginPath(); + context.arc(canvas.width - radius, radius, radius, 0, 2 * Math.PI); + + context.fillStyle = Color[status]; + context.fill(); + } // Replace favicon favicon.setAttribute('href', canvas.toDataURL('image/png')); -- 2.39.5