fix onControlsClick, checkIndex for gallery

ganlanyuan · Oct 24, 2017 · 1e94968 · 1e94968
1 parent b4d4926
commit 1e94968
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 23 deletions.
diff --git a/dist/min/tiny-slider.js b/dist/min/tiny-slider.js
diff --git a/dist/sourcemaps/tiny-slider.js.map b/dist/sourcemaps/tiny-slider.js.map
diff --git a/dist/tiny-slider.js b/dist/tiny-slider.js
@@ -1542,11 +1542,7 @@ var tns = function(options) {
   var checkIndex = (function () {
     if (loop) {
       return function () {
-        var leftEdge = indexMin, rightEdge = indexMax;
-        if (carousel) {
-          leftEdge += slideBy;
-          rightEdge -= slideBy;
-        }
+        var leftEdge = indexMin + slideBy, rightEdge = indexMax - slideBy;
 
         var gt = gutter ? gutter : 0;
         if (fixedWidth && vpOuter%(fixedWidth + gt) > gt) { rightEdge -= 1; }
@@ -2113,6 +2109,7 @@ var tns = function(options) {
       }
 
       if (target && target === prevButton || dir === -1) {
+        if (!carousel && index === 0) { checkIndex(); }
         if (index > indexMin) {
           index -= slideBy;
           shouldRender = true;

diff --git a/src/tiny-slider.js b/src/tiny-slider.js
@@ -1162,11 +1162,7 @@ export var tns = function(options) {
   var checkIndex = (function () {
     if (loop) {
       return function () {
-        var leftEdge = indexMin, rightEdge = indexMax;
-        if (carousel) {
-          leftEdge += slideBy;
-          rightEdge -= slideBy;
-        }
+        var leftEdge = indexMin + slideBy, rightEdge = indexMax - slideBy;
 
         var gt = gutter ? gutter : 0;
         if (fixedWidth && vpOuter%(fixedWidth + gt) > gt) { rightEdge -= 1; }
@@ -1733,6 +1729,7 @@ export var tns = function(options) {
       }
 
       if (target && target === prevButton || dir === -1) {
+        if (!carousel && index === 0) { checkIndex(); }
         if (index > indexMin) {
           index -= slideBy;
           shouldRender = true;

diff --git a/src/tiny-slider.module.js b/src/tiny-slider.module.js
@@ -1162,11 +1162,7 @@ export var tns = function(options) {
   var checkIndex = (function () {
     if (loop) {
       return function () {
-        var leftEdge = indexMin, rightEdge = indexMax;
-        if (carousel) {
-          leftEdge += slideBy;
-          rightEdge -= slideBy;
-        }
+        var leftEdge = indexMin + slideBy, rightEdge = indexMax - slideBy;
 
         var gt = gutter ? gutter : 0;
         if (fixedWidth && vpOuter%(fixedWidth + gt) > gt) { rightEdge -= 1; }
@@ -1733,6 +1729,7 @@ export var tns = function(options) {
       }
 
       if (target && target === prevButton || dir === -1) {
+        if (!carousel && index === 0) { checkIndex(); }
         if (index > indexMin) {
           index -= slideBy;
           shouldRender = true;

diff --git a/tests/index.html b/tests/index.html
@@ -1106,7 +1106,7 @@ <h2>
         <div class="autoHeight" id="autoHeight">
           <div>
             <div>
-              <img src="images/1000x600/1.png" alt="">
+              <img src="images/1000x900/1.png" alt="">
             </div>
             <p>
               Sunt dignissimos distinctio, veniam, tenetur aspernatur nulla!
@@ -1130,15 +1130,15 @@ <h2>
           </div>
           <div>
             <div>
-              <img src="images/1000x600/4.png" alt="">
+              <img src="images/1000x700/4.png" alt="">
             </div>
             <p>
               Nisi inventore quo delectus perspiciatis voluptatibus, quae.
             </p>
           </div>
           <div>
             <div>
-              <img src="images/1000x900/5.png" alt="">
+              <img src="images/1000x600/5.png" alt="">
             </div>
             <p>
               Nisi harum earum consectetur laudantium iusto, laboriosam.

diff --git a/tests/tests.html b/tests/tests.html
@@ -1634,23 +1634,23 @@ <h2>
         <div class="autoHeight" id="autoHeight">
           <div>
             <div>
-              <img src="images/1000x800/1.png" alt="">
+              <img src="images/1000x900/1.png" alt="">
             </div>
             <p>
               Sunt dignissimos distinctio, veniam, tenetur aspernatur nulla!
             </p>
           </div>
           <div>
             <div>
-              <img src="images/1000x800/2.png" alt="">
+              <img src="images/1000x700/2.png" alt="">
             </div>
             <p>
               Corrupti, libero minima nihil expedita officiis? Quo.
             </p>
           </div>
           <div>
             <div>
-              <img src="images/1000x700/3.png" alt="">
+              <img src="images/1000x800/3.png" alt="">
             </div>
             <p>
               Alias rem, ab impedit recusandae repellat tempore.