bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-18 09:13:33 +00:00
Code Issues Releases Wiki Activity

[SM-340] Fix share modal not closing on cancel (#4041)

Browse Source
This commit is contained in:
Oscar Hinton
2022-11-11 15:43:19 +01:00
committed by GitHub
parent b96ae86de2
commit d3321ebe1c
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/desktop/src/app/vault/share.component.html
View File

@@ -72,7 +72,7 @@
aria-hidden="true" aria-hidden="true"
></i> ></i>
</button> </button>
<button type="button" data-dismiss="modal">{{ "cancel" | i18n }}</button> <button type="button" (click)="close()">{{ "cancel" | i18n }}</button>
</div> </div>
</ng-container> </ng-container>
</form> </form>

8
apps/desktop/src/app/vault/share.component.ts
View File

@@ -1,5 +1,6 @@
import { Component } from "@angular/core"; import { Component } from "@angular/core";
import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref";
import { ShareComponent as BaseShareComponent } from "@bitwarden/angular/components/share.component"; import { ShareComponent as BaseShareComponent } from "@bitwarden/angular/components/share.component";
import { CipherService } from "@bitwarden/common/abstractions/cipher.service"; import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
import { CollectionService } from "@bitwarden/common/abstractions/collection.service"; import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
@@ -19,7 +20,8 @@ export class ShareComponent extends BaseShareComponent {
collectionService: CollectionService, collectionService: CollectionService,
platformUtilsService: PlatformUtilsService, platformUtilsService: PlatformUtilsService,
logService: LogService, logService: LogService,
organizationService: OrganizationService organizationService: OrganizationService,
private modalRef: ModalRef
) { ) {
super( super(
collectionService, collectionService,
@@ -30,4 +32,8 @@ export class ShareComponent extends BaseShareComponent {
organizationService organizationService
); );
} }
protected close() {
this.modalRef.close();
}
} }