Merge pull request #29 from lukemnet/btnfix

event fix
lwojcik · Apr 6, 2019 · afdd766 · afdd766
2 parents 5b4f2d2 + 10e0764
commit afdd766
Show file tree

Hide file tree

Showing 61 changed files with 37 additions and 37 deletions.
diff --git a/dist/examples/basic.html b/dist/examples/basic.html
@@ -33,7 +33,7 @@ <h3>JavaScript</h3>
       <p>See <a href="../notes/api.html">API documentation</a> for all available options or <a href="../notes/styling.html">CSS styling</a> for a minimum viable stylesheet.</p>
       <p><a href="../">&laquo; Back to main page</a></p>
     </div>
-    <script src="../js/tridi.js"></script>
+    <script src="../js/tridi.min.js"></script>
     <script>
       new Tridi({
         element: '#tridi-basic',

diff --git a/dist/examples/dynamic.html b/dist/examples/dynamic.html
@@ -123,23 +123,23 @@ <h3>JavaScript</h3>
 
       switchToWhiteBtn.addEventListener('touchstart', function() {
         switchColor('white');
-      });
+      }, { passive: true });
 
       switchToBlackBtn.addEventListener('click', function() {
         switchColor('black');
       });
 
       switchToBlackBtn.addEventListener('touchstart', function() {
         switchColor('black');
-      });
+      }, { passive: true });
 
       switchToRedBtn.addEventListener('click', function() {
         switchColor('red');
       });
 
       switchToRedBtn.addEventListener('touchstart', function() {
         switchColor('red');
-      });
+      }, { passive: true });
     </script>
   </body>
 </html>
diff --git a/dist/images/1.png b/dist/images/1.png
diff --git a/dist/images/10.png b/dist/images/10.png
diff --git a/dist/images/11.png b/dist/images/11.png
diff --git a/dist/images/12.png b/dist/images/12.png
diff --git a/dist/images/13.png b/dist/images/13.png
diff --git a/dist/images/14.png b/dist/images/14.png
diff --git a/dist/images/15.png b/dist/images/15.png
diff --git a/dist/images/16.png b/dist/images/16.png
diff --git a/dist/images/17.png b/dist/images/17.png
diff --git a/dist/images/18.png b/dist/images/18.png
diff --git a/dist/images/19.png b/dist/images/19.png
diff --git a/dist/images/2.png b/dist/images/2.png
diff --git a/dist/images/20.png b/dist/images/20.png
diff --git a/dist/images/21.png b/dist/images/21.png
diff --git a/dist/images/22.png b/dist/images/22.png
diff --git a/dist/images/23.png b/dist/images/23.png
diff --git a/dist/images/24.png b/dist/images/24.png
diff --git a/dist/images/25.png b/dist/images/25.png
diff --git a/dist/images/26.png b/dist/images/26.png
diff --git a/dist/images/27.png b/dist/images/27.png
diff --git a/dist/images/28.png b/dist/images/28.png
diff --git a/dist/images/29.png b/dist/images/29.png
diff --git a/dist/images/3.png b/dist/images/3.png
diff --git a/dist/images/30.png b/dist/images/30.png
diff --git a/dist/images/31.png b/dist/images/31.png
diff --git a/dist/images/32.png b/dist/images/32.png
diff --git a/dist/images/33.png b/dist/images/33.png
diff --git a/dist/images/34.png b/dist/images/34.png
diff --git a/dist/images/35.png b/dist/images/35.png
diff --git a/dist/images/36.png b/dist/images/36.png
diff --git a/dist/images/37.png b/dist/images/37.png
diff --git a/dist/images/38.png b/dist/images/38.png
diff --git a/dist/images/39.png b/dist/images/39.png
diff --git a/dist/images/4.png b/dist/images/4.png
diff --git a/dist/images/40.png b/dist/images/40.png
diff --git a/dist/images/41.png b/dist/images/41.png
diff --git a/dist/images/42.png b/dist/images/42.png
diff --git a/dist/images/43.png b/dist/images/43.png
diff --git a/dist/images/44.png b/dist/images/44.png
diff --git a/dist/images/45.png b/dist/images/45.png
diff --git a/dist/images/46.png b/dist/images/46.png
diff --git a/dist/images/47.png b/dist/images/47.png
diff --git a/dist/images/48.png b/dist/images/48.png
diff --git a/dist/images/49.png b/dist/images/49.png
diff --git a/dist/images/5.png b/dist/images/5.png
diff --git a/dist/images/50.png b/dist/images/50.png
diff --git a/dist/images/51.png b/dist/images/51.png
diff --git a/dist/images/6.png b/dist/images/6.png
diff --git a/dist/images/7.png b/dist/images/7.png
diff --git a/dist/images/8.png b/dist/images/8.png
diff --git a/dist/images/9.png b/dist/images/9.png
diff --git a/dist/images/black/36.jpg b/dist/images/black/36.jpg
diff --git a/dist/js/tridi.d.ts b/dist/js/tridi.d.ts
@@ -96,10 +96,10 @@ declare class Tridi {
     private populateStash;
     private generateViewerImage;
     private updateViewerImage;
-    private nextMove;
-    private prevMove;
     private nextFrame;
     private prevFrame;
+    private nextMove;
+    private prevMove;
     private rotateViewerImage;
     private startDragging;
     private stopDragging;

diff --git a/dist/js/tridi.js b/dist/js/tridi.js
diff --git a/dist/js/tridi.js.map b/dist/js/tridi.js.map
diff --git a/dist/js/tridi.min.d.ts b/dist/js/tridi.min.d.ts
@@ -96,10 +96,10 @@ declare class Tridi {
     private populateStash;
     private generateViewerImage;
     private updateViewerImage;
-    private nextMove;
-    private prevMove;
     private nextFrame;
     private prevFrame;
+    private nextMove;
+    private prevMove;
     private rotateViewerImage;
     private startDragging;
     private stopDragging;

diff --git a/dist/js/tridi.min.js b/dist/js/tridi.min.js
diff --git a/dist/js/tridi.min.js.map b/dist/js/tridi.min.js.map
diff --git a/src/tridi.ts b/src/tridi.ts
@@ -352,28 +352,28 @@ class Tridi {
       : this.firstImage();
   }
 
-  private nextMove() {
-    return this.inverse ? this.prevFrame() : this.nextFrame();
-  }
-
-  private prevMove() {
-    return this.inverse ? this.nextFrame() : this.prevFrame();
-  }
-
   private nextFrame() {
     this.imageIndex = this.imageIndex <= 1
       ? this.count!
       : this.imageIndex - 1;
 
-      this.viewerImage().src = this.image(this.imageIndex);
+    this.viewerImage().src = this.image(this.imageIndex);
   }
 
   private prevFrame() {
     this.imageIndex = this.imageIndex >= this.count!
       ? 1
       : this.imageIndex + 1;
 
-      this.viewerImage().src = this.image(this.imageIndex);
+    this.viewerImage().src = this.image(this.imageIndex);
+  }
+
+  private nextMove() {
+    return this.inverse ? this.prevFrame() : this.nextFrame();
+  }
+
+  private prevMove() {
+    return this.inverse ? this.nextFrame() : this.prevFrame();
   }
 
   private rotateViewerImage(e: MouseEvent | TouchEvent) {
@@ -485,7 +485,7 @@ class Tridi {
   private attachMousewheelEvents() {
     if (this.mousewheel) {
       this.viewerImage().addEventListener("wheel", e => {
-        if (e.preventDefault) e.preventDefault();
+        if (e.preventDefault && !this.passive) e.preventDefault();
         e.deltaY / 120 > 0 ? this.nextMove() : this.prevMove();
       }, { passive: this.passive });
     }
@@ -517,8 +517,8 @@ class Tridi {
 
   private attachButtonsEvents() {
     if (this.buttons) {
-      if (this.leftBtn()) this.attachBtnEvents(this.leftBtn(), this.nextMove);
-      if (this.rightBtn()) this.attachBtnEvents(this.rightBtn(), this.prevMove);
+      if (this.leftBtn()) this.attachBtnEvents(this.leftBtn(), this.nextMove.bind(this));
+      if (this.rightBtn()) this.attachBtnEvents(this.rightBtn(), this.prevMove.bind(this));
     }
   }
 
@@ -534,13 +534,13 @@ class Tridi {
 
       if (skipDelay) {
         const autoplayInterval = window.setInterval(() => {
-          this.nextFrame();
+          this.nextMove();
         }, speed);
         this.intervals.push(autoplayInterval);
       } else {
         const autoplayTimeout = window.setTimeout(() => {
           const autoplayInterval = window.setInterval(() => {
-            this.nextFrame();
+            this.nextMove();
           }, speed);
           this.intervals.push(autoplayInterval);
         }, this.resumeAutoplayDelay);