Merge branch 'main' into autofill/pm-7663-update-build-pipeline-for-beta-labeling
This commit is contained in:
commit
e90cc68648
|
@ -130,7 +130,9 @@ export default class AutofillService implements AutofillServiceInterface {
|
||||||
|
|
||||||
if (triggeringOnPageLoad && autoFillOnPageLoadIsEnabled) {
|
if (triggeringOnPageLoad && autoFillOnPageLoadIsEnabled) {
|
||||||
injectedScripts.push("autofiller.js");
|
injectedScripts.push("autofiller.js");
|
||||||
} else {
|
}
|
||||||
|
|
||||||
|
if (!triggeringOnPageLoad) {
|
||||||
await this.scriptInjectorService.inject({
|
await this.scriptInjectorService.inject({
|
||||||
tabId: tab.id,
|
tabId: tab.id,
|
||||||
injectDetails: { file: "content/content-message-handler.js", runAt: "document_start" },
|
injectDetails: { file: "content/content-message-handler.js", runAt: "document_start" },
|
||||||
|
|
|
@ -184,8 +184,6 @@ export class AddEditComponent implements OnInit, OnDestroy {
|
||||||
FeatureFlag.FlexibleCollectionsV1,
|
FeatureFlag.FlexibleCollectionsV1,
|
||||||
false,
|
false,
|
||||||
);
|
);
|
||||||
this.writeableCollections = await this.loadCollections();
|
|
||||||
this.canUseReprompt = await this.passwordRepromptService.enabled();
|
|
||||||
|
|
||||||
this.policyService
|
this.policyService
|
||||||
.policyAppliesToActiveUser$(PolicyType.PersonalOwnership)
|
.policyAppliesToActiveUser$(PolicyType.PersonalOwnership)
|
||||||
|
@ -197,6 +195,9 @@ export class AddEditComponent implements OnInit, OnDestroy {
|
||||||
takeUntil(this.destroy$),
|
takeUntil(this.destroy$),
|
||||||
)
|
)
|
||||||
.subscribe();
|
.subscribe();
|
||||||
|
|
||||||
|
this.writeableCollections = await this.loadCollections();
|
||||||
|
this.canUseReprompt = await this.passwordRepromptService.enabled();
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnDestroy() {
|
ngOnDestroy() {
|
||||||
|
|
Loading…
Reference in New Issue