ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5074 from tsiegleauq/motion-detail-manual-cd

Browse Source 
use manual cd in motion detail
This commit is contained in:
Finn Stutzenstein 2019-10-15 15:17:27 +03:00 committed by GitHub
commit 4466e15343
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
client/src/app/site/motions/modules/motion-detail/components/motion-detail/motion-detail.component.ts
View File

@ -1,4 +1,13 @@
import { Component, ElementRef, HostListener, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; import {
ChangeDetectionStrategy,
ChangeDetectorRef,
Component,
ElementRef,
HostListener,
OnDestroy,
OnInit,
ViewEncapsulation
} from '@angular/core';
import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
import { MatCheckboxChange } from '@angular/material/checkbox'; import { MatCheckboxChange } from '@angular/material/checkbox';
import { ErrorStateMatcher } from '@angular/material/core'; import { ErrorStateMatcher } from '@angular/material/core';
@ -69,6 +78,7 @@ import {
selector: 'os-motion-detail', selector: 'os-motion-detail',
templateUrl: './motion-detail.component.html', templateUrl: './motion-detail.component.html',
styleUrls: ['./motion-detail.component.scss'], styleUrls: ['./motion-detail.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
encapsulation: ViewEncapsulation.None encapsulation: ViewEncapsulation.None
}) })
export class MotionDetailComponent extends BaseViewComponent implements OnInit, OnDestroy { export class MotionDetailComponent extends BaseViewComponent implements OnInit, OnDestroy {
@ -444,7 +454,8 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
private itemRepo: ItemRepositoryService, private itemRepo: ItemRepositoryService,
private motionSortService: MotionSortListService, private motionSortService: MotionSortListService,
private motionFilterService: MotionFilterListService, private motionFilterService: MotionFilterListService,
private routingStateService: RoutingStateService private routingStateService: RoutingStateService,
private cd: ChangeDetectorRef
) { ) {
super(title, translate, matSnackBar); super(title, translate, matSnackBar);
} }
@ -527,6 +538,7 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
this.navigationSubscription.unsubscribe(); this.navigationSubscription.unsubscribe();
} }
super.ngOnDestroy(); super.ngOnDestroy();
this.cd.detach();
} }
/** /**
@ -582,6 +594,7 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
return 0; return 0;
} }
}); });
this.cd.markForCheck();
} }
/** /**
@ -609,6 +622,7 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
if (!this.editMotion) { if (!this.editMotion) {
this.patchForm(this.motion); this.patchForm(this.motion);
} }
this.cd.markForCheck();
} }
}), }),
@ -1225,6 +1239,7 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit,
} else { } else {
this.nextMotion = null; this.nextMotion = null;
} }
this.cd.markForCheck();
} }
} }