Fixed merge conflicts from the 4.x.x merge

zefoy · Sep 25, 2017 · e236984 · e236984
2 parents 42a0b1a + 4cbb708
commit e236984
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "description": "Angular wrapper library for Perfect Scrollbar",
   "bugs": "https://github.com/zefoy/ngx-perfect-scrollbar/issues",
   "license": "MIT",
-  "version": "5.0.0-2",
+  "version": "5.0.0-3",
   "main": "bundles/ngx-perfect-scrollbar.umd.js",
   "module": "./dist/index.js",
   "typings": "./dist/index.d.ts",

diff --git a/src/lib/perfect-scrollbar.directive.ts b/src/lib/perfect-scrollbar.directive.ts
@@ -87,15 +87,15 @@ export class PerfectScrollbarDirective implements OnInit, OnDestroy, DoCheck, On
       changes['hidden'].previousValue = !changes['fxShow'].previousValue;
     }
 
-    if (changes['disabled']) {
+    if (changes['disabled'] && !changes['disabled'].isFirstChange()) {
       if (changes['disabled'].currentValue !== changes['disabled'].previousValue) {
         if (changes['disabled'].currentValue === true) {
          this.ngOnDestroy();
         } else if (changes['disabled'].currentValue === false) {
           this.ngAfterViewInit();
         }
       }
-    } else if (changes['hidden']) {
+    } else if (changes['hidden'] && !changes['hidden'].isFirstChange()) {
       if (changes['hidden'].currentValue !== changes['hidden'].previousValue) {
         if (changes['hidden'].currentValue === false) {
           this.update();