nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1205 Fixed problem with the callback of confirmation dialogs

This commit is contained in:
Tristan Eisermann 2020-05-13 11:25:10 +02:00
parent e64af885b3
commit 7ebc468adc
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/package-lock.json generated
View File

@ -7017,11 +7017,6 @@
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
"integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="
}, },
"hammerjs": {
"version": "2.0.8",
"resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
"integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
},
"handle-thing": { "handle-thing": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",

2
web/src/app/shared/components/popup/dialog-pop-up.component.html
View File

@ -10,7 +10,7 @@
<button mat-dialog-close mat-stroked-button data-dismiss="modal" type="button"> <button mat-dialog-close mat-stroked-button data-dismiss="modal" type="button">
<span data-toggle="tooltip" class="material-icons md-20 red">cancel</span> <span data-toggle="tooltip" class="material-icons md-20 red">cancel</span>
</button> </button>
<button *ngIf="isDialog" mat-dialog-close="callback" mat-raised-button color="primary" <button *ngIf="isDialog" [mat-dialog-close]="callback" mat-raised-button color="primary"
data-dismiss="modal" type="button"> data-dismiss="modal" type="button">
<span data-toggle="tooltip" class="material-icons md-20 white">done</span> <span data-toggle="tooltip" class="material-icons md-20 white">done</span>
</button> </button>

8
web/src/app/shared/components/popup/dialog-pop-up.component.spec.ts
View File

@ -1,5 +1,8 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MAT_DIALOG_DATA, MAT_DIALOG_SCROLL_STRATEGY, MatDialog } from '@angular/material/dialog'; import { MAT_DIALOG_DATA,
MAT_DIALOG_SCROLL_STRATEGY,
MatDialog,
MatDialogClose, MatDialogModule } from '@angular/material/dialog';
import { DialogPopUpComponent } from './dialog-pop-up.component'; import { DialogPopUpComponent } from './dialog-pop-up.component';
@ -10,7 +13,8 @@ describe('PopupComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [DialogPopUpComponent], declarations: [DialogPopUpComponent],
providers: [MatDialog, { provide: MAT_DIALOG_SCROLL_STRATEGY }, { provide: MAT_DIALOG_DATA }] providers: [{ provide: MAT_DIALOG_SCROLL_STRATEGY }, { provide: MAT_DIALOG_DATA }],
imports: [MatDialogModule]
}).compileComponents(); }).compileComponents();
})); }));