Merge branch 'master' into spacecraft-customizations

woocommerce · Nov 22, 2024 · dd7a53d · dd7a53d
2 parents ba68e0d + acb6fd2
commit dd7a53d
Show file tree

Hide file tree

Showing 28 changed files with 260 additions and 71 deletions.
diff --git a/README.md b/README.md
@@ -1,10 +1,13 @@
-[![Gitter chat](https://badges.gitter.im/woothemes/FlexSlider.png)](https://gitter.im/woothemes/FlexSlider)
+# FlexSlider 2.7.2 - SpaceCraft customizations branch
 
+This repo is for SpaceCraft customizations to FlexSlider (detailed in `@preserve` comment in `jquery.flexslider.js`).
 
-# FlexSlider 2.7.0 - SpaceCraft customizations branch
-**This branch should be used for SpaceCraft customizations that may not be appropriate for contribution back to the origin project at https://github.com/woocommerce/FlexSlider/ — changes that ARE intended for upstream pull requests should be made in `master` then merged into this branch.**
+No source changes will be coming from upstream, per the upstream README:
 
-SpaceCraft deployments can/should be prepped with `npm run build`, which minifies `jquery.flexslider.js`, builds the LESS source into CSS, and copies the built CSS and JS into the appropriate spot in the demo project.
+> Please note that this repository is no longer actively developed. See [the discussion](https://github.com/woocommerce/woocommerce/discussions/48302). The most recent version of FlexSlider is currently incubated 
+> [within WooCommerce](https://github.com/woocommerce/woocommerce/blob/trunk/plugins/woocommerce/client/legacy/js/flexslider/jquery.flexslider.js).
+
+SpaceCraft/W360 deployments can/should be prepped with `npm run build`, which minifies `jquery.flexslider.js`, builds the LESS source into CSS, and copies the built CSS and JS into the appropriate spot in the demo project.
 
 http://www.woothemes.com/flexslider/ - Copyright (c) 2015 WooThemes
 
@@ -24,6 +27,14 @@ 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.
+
 ** Version 2.7.0 **
 
 ** Fixes resize method call for orientationchange. Adds RTL feature - param "rtl" added. **
@@ -216,3 +227,7 @@ Boolean. Whether or not you'd like FlexSlider to initialize as usual if only one
 ### rtl: *{new}*
 Boolean. False by default. Supports RTL functionality in the slider.
 *Note: you must add `style="direction:rtl"` to your container div in order for this to work.*
+
+### isFirefox: *{new}*
+Boolean. False by default. Set to true if the Firefox browser is in use.
+*Note: used for RTL compatibility logic.*
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "flexslider",
-  "version": "2.7.0",
+  "version": "2.7.2",
   "homepage": "https://github.com/woocommerce/FlexSlider",
   "authors": [
     "Automattic <[email protected]>"

diff --git a/changelog.txt b/changelog.txt
@@ -45,4 +45,11 @@ FLEXSLIDER CHANGELOG
 2018.02.01 - Version 2.7.0
 * Fixes resize method call for orientationchange.
 * Adds RTL feature - param "rtl" added.
-* Adds RTL demo's.
+* Adds RTL demo's.
+
+2018.06.15 - Version 2.7.1
+* Firefox RTL fixes.
+* Adds "isFirefox" param.
+
+2019.03.07 - Version 2.7.2
+* Refactor jQuery HTML output for img attributes.
diff --git a/css/theme.less b/css/theme.less
@@ -38,6 +38,14 @@
   }
 }
 
+@-moz-document url-prefix() {
+  .loading { 
+    .flex-viewport {
+      max-height: none;
+    }
+  }
+} 
+
 .carousel li {
 
   margin-right: 5px;

diff --git a/demo/asnavfor-rtl.html b/demo/asnavfor-rtl.html
@@ -37,7 +37,7 @@
 
   <div id="container" class="cf">
     <header role="navigation">
-      <a class="logo" href="http://www.woothemes.com" title="WooThemes">
+      <a class="logo" href="https://www.woocommerce.com" title="WooThemes">
         <img src="images/logo.png" alt="WooThemes" />
 	  </a>
       <h1>FlexSlider 2</h1>
@@ -307,4 +307,4 @@ <h3>Slider with Carousel Slider as Navigation - RTL</h3>
   <script defer src="js/demo.js"></script>
 
 </body>
-</html>
+</html>
diff --git a/demo/basic-carousel-rtl.html b/demo/basic-carousel-rtl.html
@@ -17,7 +17,7 @@
 
   <div id="container" class="cf">
     <header role="navigation">
-      <a class="logo" href="http://www.woothemes.com" title="WooThemes">
+      <a class="logo" href="https://www.woocommerce.com" title="WooThemes">
         <img src="images/logo.png" alt="WooThemes" />
 	  </a>
       <h1>FlexSlider 2</h1>

diff --git a/demo/basic-carousel.html b/demo/basic-carousel.html
@@ -20,7 +20,7 @@
 
   <div id="container" class="cf">
     <header role="navigation">
-      <a class="logo" href="http://www.woothemes.com" title="WooThemes">
+      <a class="logo" href="https://www.woocommerce.com" title="WooThemes">
         <img src="images/logo.png" alt="WooThemes" />
 	  </a>
       <h1>FlexSlider 2</h1>

diff --git a/demo/basic-slider-with-caption.html b/demo/basic-slider-with-caption.html
@@ -37,7 +37,7 @@
 
   <div id="container" class="cf">
     <header role="navigation">
-      <a class="logo" href="http://www.woothemes.com" title="WooThemes">
+      <a class="logo" href="https://www.woocommerce.com" title="WooThemes">
         <img src="images/logo.png" alt="WooThemes" />
 	  </a>
       <h1>FlexSlider 2</h1>

diff --git a/demo/basic-slider-with-custom-direction-nav.html b/demo/basic-slider-with-custom-direction-nav.html
@@ -49,7 +49,7 @@
 
   <div id="container" class="cf">
     <header role="navigation">
-      <a class="logo" href="http://www.woothemes.com" title="WooThemes">
+      <a class="logo" href="https://www.woocommerce.com" title="WooThemes">
         <img src="images/logo.png" alt="WooThemes" />
     </a>
       <h1>FlexSlider 2</h1>

diff --git a/demo/carousel-min-max.html b/demo/carousel-min-max.html
@@ -20,7 +20,7 @@
 
   <div id="container" class="cf">
     <header role="navigation">
-      <a class="logo" href="http://www.woothemes.com" title="WooThemes">
+      <a class="logo" href="https://www.woocommerce.com" title="WooThemes">
         <img src="images/logo.png" alt="WooThemes" />
 	   </a>
      <h1>FlexSlider 2</h1>

diff --git a/demo/css/flexslider-rtl-min.css b/demo/css/flexslider-rtl-min.css
@@ -0,0 +1,11 @@
+/*
+ * jQuery FlexSlider v2.7.2
+ * http://www.woothemes.com/flexslider/
+ *
+ * Copyright 2012 WooThemes
+ * Free to use under the GPLv2 and later license.
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * Contributing author: Tyler Smith (@mbmufffin)
+ *
+ */.flexslider{direction:rtl}.carousel li{margin-right:5px}.flex-direction-nav{*height:0}.flex-direction-nav a:before{content:'\f002'}.flex-direction-nav a.flex-next:before{content:'\f001'}.flex-direction-nav .flex-prev{left:auto;right:-50px}.flex-direction-nav .flex-next{right:auto;left:-50px;text-align:left}.flexslider:hover .flex-direction-nav .flex-prev{opacity:0.7;left:auto;right:10px}.flexslider:hover .flex-direction-nav .flex-next{opacity:0.7;right:auto;left:10px}.flex-pauseplay a{left:auto;right:10px}@media screen and (max-width: 860px){.flex-direction-nav .flex-prev{left:auto;right:10px}.flex-direction-nav .flex-next{right:auto;left:10px}}
diff --git a/demo/css/flexslider-rtl.css b/demo/css/flexslider-rtl.css
@@ -0,0 +1,75 @@
+/*
+ * jQuery FlexSlider v2.7.2
+ * http://www.woothemes.com/flexslider/
+ *
+ * Copyright 2012 WooThemes
+ * Free to use under the GPLv2 and later license.
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * Contributing author: Tyler Smith (@mbmufffin)
+ *
+ */
+/* ====================================================================================================================
+ * FONT-FACE
+ * ====================================================================================================================*/
+
+/* ====================================================================================================================
+ * RESETS
+ * ====================================================================================================================*/
+
+/* ====================================================================================================================
+ * BASE STYLES
+ * ====================================================================================================================*/
+.flexslider {
+	direction:rtl;
+}
+/* ====================================================================================================================
+ * DEFAULT THEME
+ * ====================================================================================================================*/
+
+.carousel li {
+  margin-right: 5px;
+}
+.flex-direction-nav {
+  *height: 0;
+}
+
+.flex-direction-nav a:before {
+  content: '\f002';
+}
+.flex-direction-nav a.flex-next:before {
+  content: '\f001';
+}
+.flex-direction-nav .flex-prev {
+  left: auto; right: -50px;
+}
+.flex-direction-nav .flex-next {
+  right: auto; left: -50px;
+  text-align: left;
+}
+.flexslider:hover .flex-direction-nav .flex-prev {
+  opacity: 0.7;
+  left: auto; right: 10px;
+}
+
+.flexslider:hover .flex-direction-nav .flex-next {
+  opacity: 0.7;
+  right: auto; left: 10px;
+}
+
+
+.flex-pauseplay a {
+  left: auto; right: 10px;
+}
+
+/* ====================================================================================================================
+ * RESPONSIVE
+ * ====================================================================================================================*/
+@media screen and (max-width: 860px) {
+  .flex-direction-nav .flex-prev {
+    left: auto; right: 10px;
+  }
+  .flex-direction-nav .flex-next {
+    right: auto; left: 10px;
+  }
+}
diff --git a/demo/css/flexslider.css b/demo/css/flexslider.css
@@ -1,6 +1,6 @@
 /*
- * jQuery FlexSlider v2.7.0
- * http://www.woothemes.com/flexslider/
+ * jQuery FlexSlider v2.7.2
+ * https://www.woocommerce.com/flexslider/
  *
  * Copyright 2012 WooThemes
  * Free to use under the GPLv2 and later license.
@@ -104,6 +104,11 @@ html[xmlns] .flexslider .slides {
 .loading .flex-viewport {
   max-height: 300px;
 }
+@-moz-document url-prefix() {
+  .loading .flex-viewport {
+    max-height: none;
+  }
+}
 .carousel li {
   margin-right: 5px;
 }

diff --git a/demo/dynamic-carousel-min-max.html b/demo/dynamic-carousel-min-max.html
@@ -20,7 +20,7 @@
 
   <div id="container" class="cf">
     <header role="navigation">
-      <a class="logo" href="http://www.woothemes.com" title="WooThemes">
+      <a class="logo" href="https://www.woocommerce.com" title="WooThemes">
         <img src="images/logo.png" alt="WooThemes" />
 	  </a>
       <h1>FlexSlider 2</h1>

diff --git a/demo/index-rtl.html b/demo/index-rtl.html
@@ -20,7 +20,7 @@
 
   <div id="container" class="cf">
     <header role="navigation">
-      <a class="logo" href="http://www.woothemes.com" title="WooThemes">
+      <a class="logo" href="https://www.woocommerce.com" title="WooThemes">
         <img src="images/logo.png" alt="WooThemes" />
 	  </a>
       <h1>FlexSlider 2</h1>

diff --git a/demo/index.html b/demo/index.html
@@ -20,7 +20,7 @@
 
   <div id="container" class="cf">
     <header role="navigation">
-      <a class="logo" href="http://www.woothemes.com" title="WooThemes">
+      <a class="logo" href="https://www.woocommerce.com" title="WooThemes">
         <img src="images/logo.png" alt="WooThemes" />
 	  </a>
       <h1>FlexSlider 2</h1>