From: Tiago Melo <tmelo@suse.com>
Date: Thu, 13 Aug 2020 11:38:15 +0000 (+0000)
Subject: mgr/dashboard: Fix favicon white circle
X-Git-Tag: v16.1.0~1433^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F36604%2Fhead;p=ceph.git

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 <tmelo@suse.com>
---

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 e9847ca06fe3..adec0664f406 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'));