Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-05 09:10:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2427 from bitwarden/bug/fix-icon-status

Browse Source
This commit is contained in:
Robyn MacCallum 2022-03-02 17:37:57 -05:00 committed by GitHub
commit 24482890b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/background/main.background.ts
View File

@ -87,6 +87,7 @@ import VaultTimeoutService from "../services/vaultTimeout.service";
import CommandsBackground from "./commands.background"; import CommandsBackground from "./commands.background";
import ContextMenusBackground from "./contextMenus.background"; import ContextMenusBackground from "./contextMenus.background";
import IdleBackground from "./idle.background"; import IdleBackground from "./idle.background";
import IconDetails from "./models/iconDetails";
import { NativeMessagingBackground } from "./nativeMessaging.background"; import { NativeMessagingBackground } from "./nativeMessaging.background";
import NotificationBackground from "./notification.background"; import NotificationBackground from "./notification.background";
import RuntimeBackground from "./runtime.background"; import RuntimeBackground from "./runtime.background";
@ -938,15 +939,15 @@ export default class MainBackground {
return; return;
} }
const options = { const options: IconDetails = {
path: { path: {
19: "images/icon19" + suffix + ".png", 19: "images/icon19" + suffix + ".png",
38: "images/icon38" + suffix + ".png", 38: "images/icon38" + suffix + ".png",
}, },
windowId: windowId,
}; };
if (this.platformUtilsService.isFirefox()) { if (this.platformUtilsService.isFirefox()) {
options.windowId = windowId;
await theAction.setIcon(options); await theAction.setIcon(options);
} else if (this.platformUtilsService.isSafari()) { } else if (this.platformUtilsService.isSafari()) {
// Workaround since Safari 14.0.3 returns a pending promise // Workaround since Safari 14.0.3 returns a pending promise

8
src/background/models/iconDetails.ts Normal file
View File

@ -0,0 +1,8 @@
export default interface IconDetails {
path: {
19: string;
38: string;
};
// Chrome does not support windowId, only Firefox
windowId?: number;
}