Merge pull request #1753 from woocommerce/release-2-7-2

Release 2 7 2
woocommerce · Mar 7, 2019 · 690832b · 690832b
2 parents d04ac5a + 9ec6d3b
commit 690832b
Show file tree

Hide file tree

Showing 14 changed files with 72 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 [![Gitter chat](https://badges.gitter.im/woothemes/FlexSlider.png)](https://gitter.im/woothemes/FlexSlider)
 
-# FlexSlider 2.7.1
+# FlexSlider 2.7.2
 http://www.woocommerce.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.7.2 **
+
+** Refactor jQuery HTML output for img attributes.
+
 ** Version 2.7.1 **
 
 ** RTL fixes for Firefox browser.

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

diff --git a/changelog.txt b/changelog.txt
@@ -49,4 +49,7 @@ FLEXSLIDER CHANGELOG
 
 2018.06.15 - Version 2.7.1
 * Firefox RTL fixes.
-* Adds "isFirefox" param.
+* Adds "isFirefox" param.
+
+2019.03.07 - Version 2.7.2
+* Refactor jQuery HTML output for img attributes.
diff --git a/demo/css/flexslider-rtl-min.css b/demo/css/flexslider-rtl-min.css
@@ -1,5 +1,5 @@
 /*
- * jQuery FlexSlider v2.7.1
+ * jQuery FlexSlider v2.7.2
  * http://www.woothemes.com/flexslider/
  *
  * Copyright 2012 WooThemes

diff --git a/demo/css/flexslider-rtl.css b/demo/css/flexslider-rtl.css
@@ -1,5 +1,5 @@
 /*
- * jQuery FlexSlider v2.7.1
+ * jQuery FlexSlider v2.7.2
  * http://www.woothemes.com/flexslider/
  *
  * Copyright 2012 WooThemes

diff --git a/demo/css/flexslider.css b/demo/css/flexslider.css
@@ -1,5 +1,5 @@
 /*
- * jQuery FlexSlider v2.7.1
+ * jQuery FlexSlider v2.7.2
  * https://www.woocommerce.com/flexslider/
  *
  * Copyright 2012 WooThemes

diff --git a/demo/js/jquery.flexslider.js b/demo/js/jquery.flexslider.js
@@ -1,5 +1,5 @@
 /*
- * jQuery FlexSlider v2.7.1
+ * jQuery FlexSlider v2.7.2
  * Copyright 2012 WooThemes
  * Contributing Author: Tyler Smith
  */
@@ -236,15 +236,35 @@
           if (slider.pagingCount > 1) {
             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', '' ); }
-              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 ( undefined === slide.attr( 'data-thumb-alt' ) ) { 
+                slide.attr( 'data-thumb-alt', '' ); 
+              }
+
+              item = $( '<a></a>' ).attr( 'href', '#' ).text( j );
+              if ( slider.vars.controlNav === "thumbnails" ) {
+                item = $( '<img/>' ).attr( 'src', slide.attr( 'data-thumb' ) );
+              }
+
+              if ( '' !== slide.attr( 'data-thumb-alt' ) ) {
+                item.attr( 'alt', slide.attr( 'data-thumb-alt' ) );
+              }
+
               if ( 'thumbnails' === slider.vars.controlNav && true === slider.vars.thumbCaptions ) {
                 var captn = slide.attr( 'data-thumbcaption' );
-                if ( '' !== captn && undefined !== captn ) { item += '<span class="' + namespace + 'caption">' + captn + '</span>'; }
+                if ( '' !== captn && undefined !== captn ) { 
+                  var caption = $('<span></span>' ).addClass( namespace + 'caption' ).text( captn );
+                  item.append( caption );
+                }
               }
-              slider.controlNavScaffold.append('<li>' + item + '</li>');
+
+              var liElement = $( '<li>' );
+              item.appendTo( liElement );
+              liElement.append( '</li>' );
+
+              slider.controlNavScaffold.append(liElement);
               j++;
+
             }
           }
 

diff --git a/flexslider-rtl-min.css b/flexslider-rtl-min.css
@@ -1,5 +1,5 @@
 /*
- * jQuery FlexSlider v2.7.1
+ * jQuery FlexSlider v2.7.2
  * https://www.woocommerce.com/flexslider/
  *
  * Copyright 2012 WooThemes

diff --git a/flexslider-rtl.css b/flexslider-rtl.css
@@ -1,5 +1,5 @@
 /*
- * jQuery FlexSlider v2.7.1
+ * jQuery FlexSlider v2.7.2
  * https://www.woocommerce.com/flexslider/
  *
  * Copyright 2012 WooThemes

diff --git a/flexslider.css b/flexslider.css
@@ -1,5 +1,5 @@
 /*
- * jQuery FlexSlider v2.7.1
+ * jQuery FlexSlider v2.7.2
  * https://www.woocommerce.com/flexslider/
  *
  * Copyright 2012 WooThemes

diff --git a/flexslider.less b/flexslider.less
@@ -1,5 +1,5 @@
 /*
- * jQuery FlexSlider v2.7.1
+ * jQuery FlexSlider v2.7.2
  * https://www.woocommerce.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.7.1
+ * jQuery FlexSlider v2.7.2
  * Copyright 2012 WooThemes
  * Contributing Author: Tyler Smith
  */
@@ -236,15 +236,35 @@
           if (slider.pagingCount > 1) {
             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', '' ); }
-              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 ( undefined === slide.attr( 'data-thumb-alt' ) ) { 
+                slide.attr( 'data-thumb-alt', '' ); 
+              }
+
+              item = $( '<a></a>' ).attr( 'href', '#' ).text( j );
+              if ( slider.vars.controlNav === "thumbnails" ) {
+                item = $( '<img/>' ).attr( 'src', slide.attr( 'data-thumb' ) );
+              }
+
+              if ( '' !== slide.attr( 'data-thumb-alt' ) ) {
+                item.attr( 'alt', slide.attr( 'data-thumb-alt' ) );
+              }
+
               if ( 'thumbnails' === slider.vars.controlNav && true === slider.vars.thumbCaptions ) {
                 var captn = slide.attr( 'data-thumbcaption' );
-                if ( '' !== captn && undefined !== captn ) { item += '<span class="' + namespace + 'caption">' + captn + '</span>'; }
+                if ( '' !== captn && undefined !== captn ) { 
+                  var caption = $('<span></span>' ).addClass( namespace + 'caption' ).text( captn );
+                  item.append( caption );
+                }
               }
-              slider.controlNavScaffold.append('<li>' + item + '</li>');
+
+              var liElement = $( '<li>' );
+              item.appendTo( liElement );
+              liElement.append( '</li>' );
+
+              slider.controlNavScaffold.append(liElement);
               j++;
+
             }
           }
 

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