Merge branch 'autofill/pm-8833-implement-on-page-autofill-menu-for-password-generation' into autofill/pm-4415-detect-password-submissions-on-forms-that-do-not-emit-submit
This commit is contained in:
commit
c3df2d8f57
|
@ -424,9 +424,14 @@ export class OverlayBackground implements OverlayBackgroundInterface {
|
||||||
CipherType.Identity,
|
CipherType.Identity,
|
||||||
])
|
])
|
||||||
).sort((a, b) => this.cipherService.sortCiphersByLastUsedThenName(a, b));
|
).sort((a, b) => this.cipherService.sortCiphersByLastUsedThenName(a, b));
|
||||||
|
if (!this.cardAndIdentityCiphers) {
|
||||||
|
return cipherViews;
|
||||||
|
}
|
||||||
|
|
||||||
for (let cipherIndex = 0; cipherIndex < cipherViews.length; cipherIndex++) {
|
for (let cipherIndex = 0; cipherIndex < cipherViews.length; cipherIndex++) {
|
||||||
const cipherView = cipherViews[cipherIndex];
|
const cipherView = cipherViews[cipherIndex];
|
||||||
if (
|
if (
|
||||||
|
this.cardAndIdentityCiphers &&
|
||||||
!this.cardAndIdentityCiphers.has(cipherView) &&
|
!this.cardAndIdentityCiphers.has(cipherView) &&
|
||||||
[CipherType.Card, CipherType.Identity].includes(cipherView.type)
|
[CipherType.Card, CipherType.Identity].includes(cipherView.type)
|
||||||
) {
|
) {
|
||||||
|
|
Loading…
Reference in New Issue