will not add marginRight when gutter is 0

ganlanyuan · Sep 20, 2016 · 702f660 · 702f660
1 parent bf3544e
commit 702f660
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/demo/index.html b/demo/index.html
@@ -148,7 +148,6 @@
       tinySlider({
         container: document.querySelector('.customize'),
         items: 3,
-        gutter: 10,
         controlsContainer: document.querySelector('.slider-controls'),
         navContainer: document.querySelector('.thumbnails'),
         lazyload: true
@@ -157,22 +156,19 @@
       tinySlider({
         container: document.querySelector('.non-loop'),
         items: 3,
-        gutter: 10,
         loop: false
       }).init();
 
       tinySlider({
         container: document.querySelector('.slide-by-page'),
         items: 3,
-        gutter: 10,
         slideByPage: true
       }).init();
 
       tinySlider({
         container: document.querySelector('.autoplay'),
         items: 3,
         autoplay: true,
-        gutter: 10,
         speed: 300,
         autoplayTimeout: 3000,
         autoplayText: ['▶', '❚❚']
@@ -181,14 +177,12 @@
       tinySlider({
         container: document.querySelector('.arrow-keys'),
         items: 3,
-        gutter: 10,
         arrowKeys: true
       }).init();
 
       tinySlider({
         container: document.querySelector('.auto-height'),
         autoHeight: true,
-        gutter: 10,
         items: 1
       }).init();
   });
@@ -236,6 +230,7 @@ <h2>responsive</h2>
     <pre><code class="language-javascript">
 tinySlider({
   container: document.querySelector('.responsive'),
+  gutter: 10,
   responsive: {
     500: 2,
     800: 3,
@@ -282,6 +277,7 @@ <h2>fixed width</h2>
     <pre><code class="language-javascript">
 tinySlider({
   container: document.querySelector('.fixed-width'),
+  gutter: 10,
   fixedWidth: 200,
   maxContainerWidth: 900,
   loop: false

diff --git a/dist/min/tiny-slider.js b/dist/min/tiny-slider.js
diff --git a/dist/min/tiny-slider.native.js b/dist/min/tiny-slider.native.js
diff --git a/dist/tiny-slider.js b/dist/tiny-slider.js
@@ -789,7 +789,9 @@ var tinySlider = (function () {
       }
       for (var b = sliderCountUpdated; b--;) {
         sliderItems[b].style.width = slideWidth - gutter + 'px';
-        sliderItems[b].style.marginRight = gutter + 'px';
+        if (gutter !== 0) {
+          sliderItems[b].style.marginRight = gutter + 'px';
+        }
       }
     }
 

diff --git a/dist/tiny-slider.native.js b/dist/tiny-slider.native.js
@@ -219,7 +219,9 @@ var tinySlider = (function () {
       }
       for (var b = sliderCountUpdated; b--;) {
         sliderItems[b].style.width = slideWidth - gutter + 'px';
-        sliderItems[b].style.marginRight = gutter + 'px';
+        if (gutter !== 0) {
+          sliderItems[b].style.marginRight = gutter + 'px';
+        }
       }
     }
 

diff --git a/src/tiny-slider.native.js b/src/tiny-slider.native.js
@@ -219,7 +219,9 @@ var tinySlider = (function () {
       }
       for (var b = sliderCountUpdated; b--;) {
         sliderItems[b].style.width = slideWidth - gutter + 'px';
-        sliderItems[b].style.marginRight = gutter + 'px';
+        if (gutter !== 0) {
+          sliderItems[b].style.marginRight = gutter + 'px';
+        }
       }
     }