Skip to content

Commit

Permalink
fix a nested slider issue, fix edgePadding in gallery mode
Browse files Browse the repository at this point in the history
  • Loading branch information
@ganlanyuan
ganlanyuan committed Sep 17, 2017
1 parent 85a2768 commit 86f8402
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 33 deletions.
2 changes: 1 addition & 1 deletion dist/min/tiny-slider.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/sourcemaps/tiny-slider.css.map
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/sourcemaps/tiny-slider.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/tiny-slider.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions dist/tiny-slider.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -875,6 +875,7 @@ var tns = function(options) {
options.axis = 'horizontal';
options.rewind = false;
options.loop = true;
options.edgePadding = false;

var animateIn = 'tns-fadeIn',
animateOut = 'tns-fadeOut',
Expand Down Expand Up @@ -1295,7 +1296,7 @@ var tns = function(options) {
}

addCSSRule(sheet, '#' + slideId, 'font-size:0;', getCssRulesLength(sheet));
addCSSRule(sheet, '#' + slideId + ' .tns-item', 'font-size:' + cssFontSize + ';', getCssRulesLength(sheet));
addCSSRule(sheet, '#' + slideId + ' > .tns-item', 'font-size:' + cssFontSize + ';', getCssRulesLength(sheet));

// slide left margin
// for IE8 & webkit browsers (no subpixel)
Expand All @@ -1314,14 +1315,14 @@ var tns = function(options) {
// container styles
if (carousel && horizontal) {
str = 'width:' + getContainerWidth(options.fixedWidth, options.gutter, options.items);
addCSSRule(sheet, '#' + slideId + '', str, getCssRulesLength(sheet));
addCSSRule(sheet, '#' + slideId, str, getCssRulesLength(sheet));
}

// slide styles
if (horizontal || options.gutter) {
str = getSlideWidthStyle(options.fixedWidth, options.gutter, options.items) +
getSlideGutterStyle(options.gutter);
addCSSRule(sheet, '#' + slideId + ' .tns-item', str, getCssRulesLength(sheet));
addCSSRule(sheet, '#' + slideId + ' > .tns-item', str, getCssRulesLength(sheet));
}

// non CSS mediaqueries: IE8
Expand All @@ -1342,7 +1343,7 @@ var tns = function(options) {
var str = getSlideWidthStyle(fixedWidth, gutter, items) +
getSlideGutterStyle(gutter);
// append to the last line
addCSSRule(sheet, '#' + slideId + ' .tns-item', str, getCssRulesLength(sheet));
addCSSRule(sheet, '#' + slideId + ' > .tns-item', str, getCssRulesLength(sheet));
}
}

Expand Down Expand Up @@ -1381,7 +1382,7 @@ var tns = function(options) {
if ('gutter' in opts) {
slideStr += getSlideGutterStyle(gutterBP);
}
if (slideStr.length > 0) { slideStr = '#' + slideId + ' .tns-item{' + slideStr + '}'; }
if (slideStr.length > 0) { slideStr = '#' + slideId + ' > .tns-item{' + slideStr + '}'; }

str = innerWrapperStr + containerStr + slideStr;

Expand Down Expand Up @@ -1765,7 +1766,7 @@ var tns = function(options) {
// add it again
if (str.length > 0) {
sheet.removeRule(getCssRulesLength(sheet) - 1);
addCSSRule(sheet, '#' + slideId + ' .tns-item', str, getCssRulesLength(sheet));
addCSSRule(sheet, '#' + slideId + ' > .tns-item', str, getCssRulesLength(sheet));
}

// will do transform later if index !== indexTem
Expand Down
13 changes: 7 additions & 6 deletions src/tiny-slider.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ export var tns = function(options) {
options.axis = 'horizontal';
options.rewind = false;
options.loop = true;
options.edgePadding = false;

var animateIn = 'tns-fadeIn',
animateOut = 'tns-fadeOut',
Expand Down Expand Up @@ -626,7 +627,7 @@ export var tns = function(options) {
}

addCSSRule(sheet, '#' + slideId, 'font-size:0;', getCssRulesLength(sheet));
addCSSRule(sheet, '#' + slideId + ' .tns-item', 'font-size:' + cssFontSize + ';', getCssRulesLength(sheet));
addCSSRule(sheet, '#' + slideId + ' > .tns-item', 'font-size:' + cssFontSize + ';', getCssRulesLength(sheet));

// slide left margin
// for IE8 & webkit browsers (no subpixel)
Expand All @@ -645,14 +646,14 @@ export var tns = function(options) {
// container styles
if (carousel && horizontal) {
str = 'width:' + getContainerWidth(options.fixedWidth, options.gutter, options.items);
addCSSRule(sheet, '#' + slideId + '', str, getCssRulesLength(sheet));
addCSSRule(sheet, '#' + slideId, str, getCssRulesLength(sheet));
}

// slide styles
if (horizontal || options.gutter) {
str = getSlideWidthStyle(options.fixedWidth, options.gutter, options.items) +
getSlideGutterStyle(options.gutter);
addCSSRule(sheet, '#' + slideId + ' .tns-item', str, getCssRulesLength(sheet));
addCSSRule(sheet, '#' + slideId + ' > .tns-item', str, getCssRulesLength(sheet));
}

// non CSS mediaqueries: IE8
Expand All @@ -673,7 +674,7 @@ export var tns = function(options) {
var str = getSlideWidthStyle(fixedWidth, gutter, items) +
getSlideGutterStyle(gutter);
// append to the last line
addCSSRule(sheet, '#' + slideId + ' .tns-item', str, getCssRulesLength(sheet));
addCSSRule(sheet, '#' + slideId + ' > .tns-item', str, getCssRulesLength(sheet));
}
}

Expand Down Expand Up @@ -712,7 +713,7 @@ export var tns = function(options) {
if ('gutter' in opts) {
slideStr += getSlideGutterStyle(gutterBP);
}
if (slideStr.length > 0) { slideStr = '#' + slideId + ' .tns-item{' + slideStr + '}'; }
if (slideStr.length > 0) { slideStr = '#' + slideId + ' > .tns-item{' + slideStr + '}'; }

str = innerWrapperStr + containerStr + slideStr;

Expand Down Expand Up @@ -1096,7 +1097,7 @@ export var tns = function(options) {
// add it again
if (str.length > 0) {
sheet.removeRule(getCssRulesLength(sheet) - 1);
addCSSRule(sheet, '#' + slideId + ' .tns-item', str, getCssRulesLength(sheet));
addCSSRule(sheet, '#' + slideId + ' > .tns-item', str, getCssRulesLength(sheet));
}

// will do transform later if index !== indexTem
Expand Down
Loading

0 comments on commit 86f8402

Please sign in to comment.