Merge pull request #1571 from woothemes/fixes_image_height_overflow

Fixes image height overflow issue.
woocommerce · Aug 17, 2016 · 5c5c5de · 5c5c5de
2 parents 622f7fd + ad3be56
commit 5c5c5de
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 16 deletions.
diff --git a/README.mdown b/README.mdown
@@ -1,6 +1,6 @@
 [![Gitter chat](https://badges.gitter.im/woothemes/FlexSlider.png)](https://gitter.im/woothemes/FlexSlider)
 
-# FlexSlider 2.6.1
+# FlexSlider 2.6.2
 http://www.woothemes.com/flexslider/ - Copyright (c) 2015 WooThemes
 
 ## Releases
@@ -19,6 +19,10 @@ To keep up to date with how FlexSlider's development roadmap looks, please see o
 
 ## Updates
 
+** Version 2.6.2 **
+
+** Minor update to fix issues with varying heights and overflow onto content below the slider. **
+
 ** Version 2.6.1 **
 
 ** SmoothHeight now uses innerHeight() instead of height() to account for padding in calculation . Defining var altText to prevent error. bower.json add fonts folder on main field. Changed true to false in order to make sure whether or not to allow a slider comprised of a single slide **

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "flexslider",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "homepage": "https://github.com/woothemes/FlexSlider",
   "authors": [
     "WooThemes <jeff@woothemes.com>"

diff --git a/changelog.txt b/changelog.txt
@@ -33,4 +33,7 @@ FLEXSLIDER CHANGELOG
 * smoothHeight now uses innerHeight() instead of height() to account for padding in calculation.
 * Defining var altText to prevent error.
 * bower.json add fonts folder on main field.
-* Changed `true` to `false` in order to make sure whether or not to allow a slider comprised of a single slide.
+* Changed `true` to `false` in order to make sure whether or not to allow a slider comprised of a single slide.
+
+2016.08.18 - Version 2.6.2
+* fixes overflow issue with varying height images.
diff --git a/flexslider.css b/flexslider.css
@@ -1,5 +1,5 @@
 /*
- * jQuery FlexSlider v2.6.1
+ * jQuery FlexSlider v2.6.2
  * http://www.woothemes.com/flexslider/
  *
  * Copyright 2012 WooThemes

diff --git a/flexslider.less b/flexslider.less
@@ -1,5 +1,5 @@
 /*
- * jQuery FlexSlider v2.6.1
+ * jQuery FlexSlider v2.6.2
  * http://www.woothemes.com/flexslider/
  *
  * Copyright 2012 WooThemes

diff --git a/jquery.flexslider-min.js b/jquery.flexslider-min.js
diff --git a/jquery.flexslider.js b/jquery.flexslider.js
@@ -1,5 +1,5 @@
 /*
- * jQuery FlexSlider v2.6.1
+ * jQuery FlexSlider v2.6.2
  * Copyright 2012 WooThemes
  * Contributing Author: Tyler Smith
  */
@@ -779,12 +779,12 @@
             //slider.slides.eq(slider.currentSlide).fadeOut(slider.vars.animationSpeed, slider.vars.easing);
             //slider.slides.eq(target).fadeIn(slider.vars.animationSpeed, slider.vars.easing, slider.wrapup);
 
-            slider.slides.eq(slider.currentSlide).css({"zIndex": 1}).animate({"opacity": 0}, slider.vars.animationSpeed, slider.vars.easing);
-            slider.slides.eq(target).css({"zIndex": 2}).animate({"opacity": 1}, slider.vars.animationSpeed, slider.vars.easing, slider.wrapup);
+            slider.slides.eq(slider.currentSlide).css({"zIndex": 1, "display": "none"}).animate({"opacity": 0}, slider.vars.animationSpeed, slider.vars.easing);
+            slider.slides.eq(target).css({"zIndex": 2, "display": "block"}).animate({"opacity": 1}, slider.vars.animationSpeed, slider.vars.easing, slider.wrapup);
 
           } else {
-            slider.slides.eq(slider.currentSlide).css({ "opacity": 0, "zIndex": 1 });
-            slider.slides.eq(target).css({ "opacity": 1, "zIndex": 2 });
+            slider.slides.eq(slider.currentSlide).css({ "opacity": 0, "zIndex": 1, "display": "none" });
+            slider.slides.eq(target).css({ "opacity": 1, "zIndex": 2, "display": "block" });
             slider.wrapup(dimension);
           }
         }
@@ -948,12 +948,12 @@
           if (!touch) {
             //slider.slides.eq(slider.currentSlide).fadeIn(slider.vars.animationSpeed, slider.vars.easing);
             if (slider.vars.fadeFirstSlide == false) {
-              slider.slides.css({ "opacity": 0, "display": "block", "zIndex": 1 }).eq(slider.currentSlide).css({"zIndex": 2}).css({"opacity": 1});
+              slider.slides.css({ "opacity": 0, "display": "none", "zIndex": 1 }).eq(slider.currentSlide).css({"zIndex": 2, "display": "block"}).css({"opacity": 1});
             } else {
-              slider.slides.css({ "opacity": 0, "display": "block", "zIndex": 1 }).eq(slider.currentSlide).css({"zIndex": 2}).animate({"opacity": 1},slider.vars.animationSpeed,slider.vars.easing);
+              slider.slides.css({ "opacity": 0, "display": "none", "zIndex": 1 }).eq(slider.currentSlide).css({"zIndex": 2, "display": "block"}).animate({"opacity": 1},slider.vars.animationSpeed,slider.vars.easing);
             }
           } else {
-            slider.slides.css({ "opacity": 0, "display": "block", "webkitTransition": "opacity " + slider.vars.animationSpeed / 1000 + "s ease", "zIndex": 1 }).eq(slider.currentSlide).css({ "opacity": 1, "zIndex": 2});
+            slider.slides.css({ "opacity": 0, "display": "none", "webkitTransition": "opacity " + slider.vars.animationSpeed / 1000 + "s ease", "zIndex": 1 }).eq(slider.currentSlide).css({ "opacity": 1, "zIndex": 2, "display": "block"});
           }
         }
         // SMOOTH HEIGHT:

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "flexslider",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "An awesome, fully responsive jQuery slider toolkit.",
   "main": "jquery.flexslider.js",
   "scripts": {