modal pagination and details.service 3

cbeldacap · cbeldacap · commit 4f69ff375e08 · 2016-08-26T13:15:20.000+02:00
diff --git a/oasp4js-sample/src/app/components/details/view/Details.component.ts b/oasp4js-sample/src/app/components/details/view/Details.component.ts
@@ -87,12 +87,8 @@ export class DetailsComponent implements OnChanges{
   submit(){
     this.parentTable.commands = this.detailsService.commands;
     this.resultEvent.emit(this.parentTable);
-<<<<<<< HEAD
     this.detailsService.resetCommands();
-    document.getElementById("modal").hidden = !document.getElementById("modal").hidden;
-=======
     this.closeWindowEvent.emit(false);
->>>>>>> 0ce25674b04094f8acc27cd440d4e31fc3b69785
   }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -87,12 +87,8 @@ export class DetailsComponent implements OnChanges{`
`87`	`87`	`submit(){`
`88`	`88`	`this.parentTable.commands = this.detailsService.commands;`
`89`	`89`	`this.resultEvent.emit(this.parentTable);`
`90`		`-<<<<<<< HEAD`
`91`	`90`	`this.detailsService.resetCommands();`
`92`		`- document.getElementById("modal").hidden = !document.getElementById("modal").hidden;`
`93`		`-=======`
`94`	`91`	`this.closeWindowEvent.emit(false);`
`95`		`->>>>>>> 0ce25674b04094f8acc27cd440d4e31fc3b69785`
`96`	`92`	`}`
`97`	`93`
`98`	`94`	`}`