Issue/131

js/jssor.slider.js

@@ -6,9 +6,9 @@
 *
 * Licensed under the MIT license:
 * http://www.opensource.org/licenses/MIT
-* 
+*
 * TERMS OF USE - Jssor.Slider
-* 
+*
 * Copyright 2014 Jssor
 *
 * Permission is hereby granted, free of charge, to any person obtaining
@@ -18,10 +18,10 @@
 * distribute, sublicense, and/or sell copies of the Software, and to
 * permit persons to whom the Software is furnished to do so, subject to
 * the following conditions:
-* 
+*
 * The above copyright notice and this permission notice shall be
 * included in all copies or substantial portions of the Software.
-* 
+*
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -3830,6 +3830,45 @@ var $JssorCaptionSlider$ = window.$JssorCaptionSlider$ = function (container, ca
         var captionParentWidth = $Jssor$.$CssWidth(captionParent);
         var captionParentHeight = $Jssor$.$CssHeight(captionParent);
 
+        // captionItem Padding, Margin and Border properties.
+        var captionItemPaddingLeft   = parseFloat( captionItem.style['padding-left'] ) ? parseFloat( captionItem.style['padding-left'] ) : 0,
+            captionItemPaddingRight  = parseFloat( captionItem.style['padding-right'] ) ? parseFloat( captionItem.style['padding-right'] ) : 0,
+            captionItemPaddingTop    = parseFloat( captionItem.style['padding-top'] ) ? parseFloat( captionItem.style['padding-top'] ) : 0,
+            captionItemPaddingBottom = parseFloat( captionItem.style['padding-bottom'] ) ? parseFloat( captionItem.style['padding-bottom'] ) : 0,
+            captionItemMarginLeft    = parseFloat( captionItem.style['margin-left'] ) ? parseFloat( captionItem.style['margin-left'] ) : 0,
+            captionItemMarginRight   = parseFloat( captionItem.style['margin-right'] ) ? parseFloat( captionItem.style['margin-right'] ) : 0,
+            captionItemMarginTop     = parseFloat( captionItem.style['margin-top'] ) ? parseFloat( captionItem.style['margin-top'] ) : 0,
+            captionItemMarginBottom  = parseFloat( captionItem.style['margin-bottom'] ) ? parseFloat( captionItem.style['margin-bottom'] ) : 0,
+            captionItemBorderLeft    = parseFloat( captionItem.style['border-left-width']) ? parseFloat( captionItem.style['border-left-width'] ) : 0,
+            captionItemBorderRight   = parseFloat( captionItem.style['border-right-width']) ? parseFloat( captionItem.style['border-right-width'] ) : 0,
+            captionItemBorderTop     = parseFloat( captionItem.style['border-top-width']) ? parseFloat( captionItem.style['border-top-width'] ) : 0,
+            captionItemBorderBottom  = parseFloat( captionItem.style['border-bottom-width']) ? parseFloat( captionItem.style['border-bottom-width'] ) : 0;
+
+        // Adding margin to width of captionItem
+        if ( captionItemMarginLeft || captionItemMarginRight ) {
+            captionItemWidth += captionItemMarginLeft + captionItemMarginRight;
+        }
+        // Adding margin to height of captionItem
+        if ( captionItemMarginTop || captionItemMarginBottom ) {
+            captionItemHeight += captionItemMarginTop + captionItemMarginBottom;
+        }
+        // Adding border to width of captionItem
+        if ( captionItemBorderLeft || captionItemBorderRight ) {
+            captionItemWidth += captionItemBorderLeft + captionItemBorderRight;
+        }
+        // Adding border to height of captionItem
+        if ( captionItemBorderTop || captionItemBorderBottom ) {
+            captionItemHeight += captionItemBorderTop + captionItemBorderBottom;
+        }
+        // Adding padding to width of captionItem
+        if ( captionItemPaddingLeft || captionItemPaddingRight ) {
+            captionItemWidth += captionItemPaddingLeft + captionItemPaddingRight;
+        }
+        // Adding padding to height of captionItem
+        if ( captionItemPaddingTop || captionItemPaddingBottom ) {
+            captionItemHeight += captionItemPaddingTop + captionItemPaddingBottom;
+        }
+
         var fromStyles = {};
         var difStyles = {};
         var scaleClip = transition.$ScaleClip || 1;