Merge pull request #1537 from woothemes/release-2-6-1

Release 2 6 1

README.mdown

@@ -1,6 +1,6 @@
 [![Gitter chat](https://badges.gitter.im/woothemes/FlexSlider.png)](https://gitter.im/woothemes/FlexSlider)
 
-# FlexSlider 2.6.0
+# FlexSlider 2.6.1
 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.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 **
+
 ** Version 2.6.0 **
 
 ** Adds composer json file, scope fix for focused keyword, fixes bower demo folder exclusion, z-index fix for disabled nav arrow, play/pause accessibility fix, itemMargin fix for slider items, fixes accessibility for in focus elements and pagination controls, firefox fix for text selection on slider carousel, adds data-thumb-alt image alt attribute **

bower.json

@@ -1,14 +1,15 @@
 {
   "name": "flexslider",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "homepage": "https://github.com/woothemes/FlexSlider",
   "authors": [
     "WooThemes <jeff@woothemes.com>"
   ],
   "description": "An awesome, fully responsive jQuery slider toolkit.",
   "main": [
     "jquery.flexslider.js",
-    "flexslider.css"
+    "flexslider.css",
+    "fonts/*"
   ],
   "keywords": [
     "flexslider",

changelog.txt

@@ -28,3 +28,9 @@ FLEXSLIDER CHANGELOG
  * Fixes accessibility for in focus elements and pagination controls
  * Firefox fix for text selection on slider carousel
  * Adds data-thumb-alt image alt attribute
+
+2016.05.12 - 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.

flexslider.css

@@ -1,5 +1,5 @@
 /*
- * jQuery FlexSlider v2.6.0
+ * jQuery FlexSlider v2.6.1
  * http://www.woothemes.com/flexslider/
  *
  * Copyright 2012 WooThemes
@@ -74,8 +74,8 @@ html[xmlns] .flexslider .slides {
  * ====================================================================================================================*/
 .flexslider {
   margin: 0 0 60px;
-  background: #ffffff;
-  border: 4px solid #ffffff;
+  background: #fff;
+  border: 4px solid #fff;
   position: relative;
   zoom: 1;
   -webkit-border-radius: 4px;

flexslider.less

@@ -1,5 +1,5 @@
 /*
- * jQuery FlexSlider v2.6.0
+ * jQuery FlexSlider v2.6.1
  * http://www.woothemes.com/flexslider/
  *
  * Copyright 2012 WooThemes

jquery.flexslider.js

@@ -1,5 +1,5 @@
 /*
- * jQuery FlexSlider v2.6.0
+ * jQuery FlexSlider v2.6.1
  * Copyright 2012 WooThemes
  * Contributing Author: Tyler Smith
  */
@@ -218,7 +218,7 @@
             for (var i = 0; i < slider.pagingCount; i++) {
               slide = slider.slides.eq(i);
               if ( undefined === slide.attr( 'data-thumb-alt' ) ) { slide.attr( 'data-thumb-alt', '' ); }
-              altText = ( '' !== slide.attr( 'data-thumb-alt' ) ) ? altText = ' alt="' + slide.attr( 'data-thumb-alt' ) + '"' : '';
+              var altText = ( '' !== slide.attr( 'data-thumb-alt' ) ) ? altText = ' alt="' + slide.attr( 'data-thumb-alt' ) + '"' : '';
               item = (slider.vars.controlNav === "thumbnails") ? '<img src="' + slide.attr( 'data-thumb' ) + '"' + altText + '/>' : '<a href="#">' + j + '</a>';
               if ( 'thumbnails' === slider.vars.controlNav && true === slider.vars.thumbCaptions ) {
                 var captn = slide.attr( 'data-thumbcaption' );
@@ -592,7 +592,7 @@
       smoothHeight: function(dur) {
         if (!vertical || fade) {
           var $obj = (fade) ? slider : slider.viewport;
-          (dur) ? $obj.animate({"height": slider.slides.eq(slider.animatingTo).height()}, dur) : $obj.height(slider.slides.eq(slider.animatingTo).height());
+          (dur) ? $obj.animate({"height": slider.slides.eq(slider.animatingTo).innerHeight()}, dur) : $obj.innerHeight(slider.slides.eq(slider.animatingTo).innerHeight());
         }
       },
       sync: function(action) {
@@ -1171,7 +1171,7 @@
             selector = (options.selector) ? options.selector : ".slides > li",
             $slides = $this.find(selector);
 
-      if ( ( $slides.length === 1 && options.allowOneSlide === true ) || $slides.length === 0 ) {
+      if ( ( $slides.length === 1 && options.allowOneSlide === false ) || $slides.length === 0 ) {
           $slides.fadeIn(400);
           if (options.start) { options.start($this); }
         } else if ($this.data('flexslider') === undefined) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "flexslider",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "An awesome, fully responsive jQuery slider toolkit.",
   "main": "jquery.flexslider.js",
   "scripts": {