Fix onDestroy directive (#25)

jfcere · Nov 25, 2017 · a807630 · a807630
1 parent 281727d
commit a807630
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 6 deletions.
diff --git a/circle.yml b/circle.yml
@@ -11,7 +11,7 @@ machine:
 
 dependencies:
   override:
-    - yarn install
+    - yarn install --no-progress
   cache_directories:
     - ~/.cache/yarn
 
@@ -20,9 +20,9 @@ test:
     - mkdir $CIRCLE_TEST_REPORTS/karma
     - mkdir $CIRCLE_TEST_REPORTS/lint
   override:
-    - yarn test -- --code-coverage --single-run
-    - yarn lint -- --formatters-dir ./tslint-formatters --format junit -o $CIRCLE_TEST_REPORTS/lint/tslint.xml
-    - yarn build -- --prod --aot
+    - yarn test --code-coverage --single-run --no-progress
+    - yarn lint --formatters-dir ./tslint-formatters --format junit -o $CIRCLE_TEST_REPORTS/lint/tslint.xml
+    - yarn build --prod --aot --no-progress
   post:
     - mv test-results.xml $CIRCLE_TEST_REPORTS/karma
     - yarn coveralls
diff --git a/package.json b/package.json
@@ -16,6 +16,7 @@
     "angular",
     "angular-2",
     "angular-4",
+    "angular-5",
     "angular2",
     "angular4",
     "angular5",

diff --git a/src/app/malihu-scrollbar/malihu-scrollbar.directive.spec.ts b/src/app/malihu-scrollbar/malihu-scrollbar.directive.spec.ts
@@ -137,5 +137,16 @@ describe('MalihuScrollbarDirective:unit', () => {
       expect(zone.runOutsideAngular).toHaveBeenCalled();
       expect(mockScrollableElement.mCustomScrollbar).toHaveBeenCalledWith('destroy');
     });
+
+    it('should swallow error if malihu-custom-scrollbar-plugin throws', () => {
+
+      const mockScrollableElement = <any>{ mCustomScrollbar: () => null };
+
+      spyOn(mockScrollableElement, 'mCustomScrollbar').and.throwError('error-x');
+
+      mScrollbarDirective.scrollableElement = mockScrollableElement;
+
+      expect(() => mScrollbarDirective.destroyScrollbar()).not.toThrow();
+    });
   });
 });
diff --git a/src/app/malihu-scrollbar/malihu-scrollbar.directive.ts b/src/app/malihu-scrollbar/malihu-scrollbar.directive.ts
@@ -43,6 +43,14 @@ export class MalihuScrollbarDirective implements AfterViewInit, OnDestroy {
   }
 
   destroyScrollbar() {
-    this.zone.runOutsideAngular(() => this.scrollableElement.mCustomScrollbar('destroy'));
+    this.zone.runOutsideAngular(() => {
+      try {
+        this.scrollableElement.mCustomScrollbar('destroy');
+      } catch (error) {
+        // workaround for malihu-custom-scrollbar-plugin issue:
+        // Cannot read property 'autoUpdate' of undefined
+        // https://github.com/malihu/malihu-custom-scrollbar-plugin/issues/392
+      }
+    });
   }
 }
diff --git a/src/index.html b/src/index.html
@@ -1,5 +1,6 @@
 <!doctype html>
 <html lang="en">
+
 <head>
   <meta charset="utf-8">
   <title>ngx-malihu-scrollbar</title>
@@ -8,7 +9,9 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
 </head>
+
 <body>
   <malihu-scrollbar-demo>Loading...</malihu-scrollbar-demo>
 </body>
-</html>
+
+</html>