Merge branch 'master' into 22

Author: SuperConfuserUser

demo/src/app/components/misc-scrollbar-demo-component/misc-scrollbar-horizontal-demo.component.ts

@@ -52,7 +52,8 @@ export class MiscScrollbarHorizontalDemoComponent implements AfterViewInit {
       ]);
     }
     content.translate(new paper.Point(VIEW_PADDING, 0));
-
+    
+    // create scrollbar
     const scrollbar = new ScrollbarComponent({
       content: content,
       containerBounds: view.bounds,
@@ -64,12 +65,12 @@ export class MiscScrollbarHorizontalDemoComponent implements AfterViewInit {
     if (scrollbar.isEnabled) {
       canvas.onmouseenter = scrollbar.containerMouseEnter;
       canvas.onmouseleave = scrollbar.containerMouseLeave;
+      
+      // add scroll listening. paper doesn't have a wheel event handler
+      canvas.onwheel = (event: WheelEvent) => {
+        scrollbar.onScroll(event);
+      };
     }
-
-    // add scroll listening. paper doesn't have a wheel event handler
-    canvas.onwheel = (event: WheelEvent) => {
-      scrollbar.onScroll(event);
-    };
   }
 
   run() {

demo/src/app/components/misc-scrollbar-demo-component/misc-scrollbar-vertical-demo.component.ts

@@ -65,12 +65,12 @@ export class MiscScrollbarVerticalDemoComponent implements AfterViewInit {
     if (scrollbar.isEnabled) {
       canvas.onmouseenter = scrollbar.containerMouseEnter;
       canvas.onmouseleave = scrollbar.containerMouseLeave;
+      
+      // add scroll listening. paper doesn't have a wheel event handler
+      canvas.onwheel = (event: WheelEvent) => {
+        scrollbar.onScroll(event);
+      };
     }
-
-    // add scroll listening. paper doesn't have a wheel event handler
-    canvas.onwheel = (event: WheelEvent) => {
-      scrollbar.onScroll(event);
-    };
   }
 
   run() {