fix: Fixed tests failing after commit for #14

nth-cloud · Oct 30, 2019 · 8c30211 · 8c30211
1 parent 83f28ca
commit 8c30211
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/toggle.ts b/src/toggle.ts
@@ -134,7 +134,7 @@ export class NgToggle implements AfterViewInit, AfterContentInit, AfterViewCheck
   ngAfterViewInit(): void {
     this.calculateWidth();
     this._initialized = true;
-    setTimeout(() => this._disableInitialAnimation = false);
+    this.ngZone.run(() => setTimeout(() => this._disableInitialAnimation = false));
   }
 
   ngAfterViewChecked(): void {
@@ -209,7 +209,7 @@ export class NgToggle implements AfterViewInit, AfterContentInit, AfterViewCheck
 
   @HostBinding('class.ng-toggle-animate')
   get animate(): boolean {
-    return this._animate && (this._initialized && !this._disableInitialAnimation);
+    return this._animate && (!this._disableInitialAnimation || this._initialized && !this._disableInitialAnimation);
   }
 
   get marginLeft(): string {