rm padding before and after for non-loop

checkdomain · Jul 31, 2018 · 566b8a7 · 566b8a7
1 parent 4fe12e9
commit 566b8a7
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 11 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
@@ -1109,8 +1109,8 @@ var tns = function(options) {
       slideItems = container.children;
     }
 
-    initSliderTransform();
     initSheet();
+    initSliderTransform();
     if (!autoWidth) { initUI(); }
     if (responsive) { setBreakpointZone(); }
 
@@ -2250,17 +2250,21 @@ var tns = function(options) {
   }
 
   function getSliderWidth () {
-    return fixedWidth ? (fixedWidth + gutter) * slideCountNew - gutter: slidePositions[slideCountNew - 1] + slideItems[slideCountNew - 1].getBoundingClientRect().width - gutter;
+    var width = fixedWidth ? (fixedWidth + gutter) * slideCountNew :
+        slidePositions[slideCountNew - 1] + slideItems[slideCountNew - 1].getBoundingClientRect().width;
+    return width - gutter; 
   }
 
   function getRightBoundary () {
-    var result = - (getSliderWidth() - viewport);
+    var result = viewport - getSliderWidth();
+    if (edgePadding) { result += edgePadding - gutter; }
     if (result > 0) { result = 0; }
     return result;
   }
 
   function getContainerTransformValue (num) {
     if (num == null) { num = index; }
+
     var val;
     if (horizontal && !autoWidth) {
       if (fixedWidth) {
@@ -2274,8 +2278,22 @@ var tns = function(options) {
     }
 
     if (hasRightDeadZone) { val = Math.max(val, rightBoundary); }
+    if (horizontal && !loop && edgePadding) {
+      var gap = edgePadding;
+
+      if (!autoWidth && !fixedWidth) {
+        gap = TRANSFORM ? gap * 100 / (viewport * slideCountNew / items) : gap / viewport;
+      }
+
+      if (num <= 0) {
+        val -= gap;
+      } else if (num >= indexMax && !autoWidth && !fixedWidth) {
+        val += gap;
+      }
+    }
 
     val += (horizontal && !autoWidth && !fixedWidth) ? '%' : 'px';
+
     return val;
   }
 

diff --git a/src/tiny-slider.js b/src/tiny-slider.js
@@ -675,8 +675,8 @@ export var tns = function(options) {
       slideItems = container.children;
     }
 
-    initSliderTransform();
     initSheet();
+    initSliderTransform();
     if (!autoWidth) { initUI(); }
     if (responsive) { setBreakpointZone(); }
 
@@ -1816,17 +1816,21 @@ export var tns = function(options) {
   }
 
   function getSliderWidth () {
-    return fixedWidth ? (fixedWidth + gutter) * slideCountNew - gutter: slidePositions[slideCountNew - 1] + slideItems[slideCountNew - 1].getBoundingClientRect().width - gutter;
+    var width = fixedWidth ? (fixedWidth + gutter) * slideCountNew :
+        slidePositions[slideCountNew - 1] + slideItems[slideCountNew - 1].getBoundingClientRect().width;
+    return width - gutter; 
   }
 
   function getRightBoundary () {
-    var result = - (getSliderWidth() - viewport);
+    var result = viewport - getSliderWidth();
+    if (edgePadding) { result += edgePadding - gutter; }
     if (result > 0) { result = 0; }
     return result;
   }
 
   function getContainerTransformValue (num) {
     if (num == null) { num = index; }
+
     var val;
     if (horizontal && !autoWidth) {
       if (fixedWidth) {
@@ -1840,8 +1844,22 @@ export var tns = function(options) {
     }
 
     if (hasRightDeadZone) { val = Math.max(val, rightBoundary); }
+    if (horizontal && !loop && edgePadding) {
+      var gap = edgePadding;
+
+      if (!autoWidth && !fixedWidth) {
+        gap = TRANSFORM ? gap * 100 / (viewport * slideCountNew / items) : gap / viewport;
+      }
+
+      if (num <= 0) {
+        val -= gap;
+      } else if (num >= indexMax && !autoWidth && !fixedWidth) {
+        val += gap;
+      }
+    }
 
     val += (horizontal && !autoWidth && !fixedWidth) ? '%' : 'px';
+
     return val;
   }
 

diff --git a/src/tiny-slider.module.js b/src/tiny-slider.module.js
@@ -675,8 +675,8 @@ export var tns = function(options) {
       slideItems = container.children;
     }
 
-    initSliderTransform();
     initSheet();
+    initSliderTransform();
     if (!autoWidth) { initUI(); }
     if (responsive) { setBreakpointZone(); }
 
@@ -1816,17 +1816,21 @@ export var tns = function(options) {
   }
 
   function getSliderWidth () {
-    return fixedWidth ? (fixedWidth + gutter) * slideCountNew - gutter: slidePositions[slideCountNew - 1] + slideItems[slideCountNew - 1].getBoundingClientRect().width - gutter;
+    var width = fixedWidth ? (fixedWidth + gutter) * slideCountNew :
+        slidePositions[slideCountNew - 1] + slideItems[slideCountNew - 1].getBoundingClientRect().width;
+    return width - gutter; 
   }
 
   function getRightBoundary () {
-    var result = - (getSliderWidth() - viewport);
+    var result = viewport - getSliderWidth();
+    if (edgePadding) { result += edgePadding - gutter; }
     if (result > 0) { result = 0; }
     return result;
   }
 
   function getContainerTransformValue (num) {
     if (num == null) { num = index; }
+
     var val;
     if (horizontal && !autoWidth) {
       if (fixedWidth) {
@@ -1840,8 +1844,22 @@ export var tns = function(options) {
     }
 
     if (hasRightDeadZone) { val = Math.max(val, rightBoundary); }
+    if (horizontal && !loop && edgePadding) {
+      var gap = edgePadding;
+
+      if (!autoWidth && !fixedWidth) {
+        gap = TRANSFORM ? gap * 100 / (viewport * slideCountNew / items) : gap / viewport;
+      }
+
+      if (num <= 0) {
+        val -= gap;
+      } else if (num >= indexMax && !autoWidth && !fixedWidth) {
+        val += gap;
+      }
+    }
 
     val += (horizontal && !autoWidth && !fixedWidth) ? '%' : 'px';
+
     return val;
   }