Skip to content

Commit

Permalink
Merge pull request #1664 from woocommerce/release-2-6-4
Browse files Browse the repository at this point in the history
Release 2 6 4
  • Loading branch information
jeffikus committed Aug 11, 2017
2 parents 0690ec2 + fb46868 commit 1a3a8ed
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 25 deletions.
16 changes: 10 additions & 6 deletions README.mdown
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
[![Gitter chat](https://badges.gitter.im/woothemes/FlexSlider.png)](https://gitter.im/woothemes/FlexSlider)

# FlexSlider 2.6.3
http://www.woothemes.com/flexslider/ - Copyright (c) 2015 WooThemes
# FlexSlider 2.6.4
http://www.woocommerce.com/flexslider/ - Copyright (c) 2015 WooThemes

## Releases

The `master` branch of this repository is always the latest development version of FlexSlider. Please view the [Releases](https://github.com/woothemes/FlexSlider/releases) section for a list of official FlexSlider builds.
The `master` branch of this repository is always the latest development version of FlexSlider. Please view the [Releases](https://github.com/woocommerce/FlexSlider/releases) section for a list of official FlexSlider builds.

### Contributing

We encourage contributions to FlexSlider and will review all pull requests submitted.

Before contributing, please see our [Contributing Guide](https://github.com/woothemes/FlexSlider/blob/master/CONTRIBUTING.md).
Before contributing, please see our [Contributing Guide](https://github.com/woocommerce/FlexSlider/blob/master/CONTRIBUTING.md).

### Roadmap

To keep up to date with how FlexSlider's development roadmap looks, please see our [development roadmap](https://github.com/woothemes/FlexSlider/wiki/Roadmap).
To keep up to date with how FlexSlider's development roadmap looks, please see our [development roadmap](https://github.com/woocommerce/FlexSlider/wiki/Roadmap).

## Updates

** Version 2.6.4 **

** Fixes resize method call for orientationchange. **

** Version 2.6.3 **

** Rollback fade fixes, due to harsh fade reports. **
Expand Down Expand Up @@ -64,7 +68,7 @@ To keep up to date with how FlexSlider's development roadmap looks, please see o
## General Notes
FlexSlider is no longer licensed under the MIT license. FlexSlider now uses the license, GPLv2 and later.

In an effort to move the plugin forward, support for jQuery 1.4.2 has been dropped. The plugin now requires jQuery 1.7.0+. If you don't have access to the later versions of jQuery, [FlexSlider 1.8](https://github.com/woothemes/FlexSlider/tree/flexslider1) should be a perfectly suitable substitute for your needs!
In an effort to move the plugin forward, support for jQuery 1.4.2 has been dropped. The plugin now requires jQuery 1.7.0+. If you don't have access to the later versions of jQuery, [FlexSlider 1.8](https://github.com/woocommerce/FlexSlider/tree/flexslider1) should be a perfectly suitable substitute for your needs!

Your old styles and properties *might not work out of the box*. Some property names have been changed, noted below, as well as namespacing prefixes being applied to all elements. This means that `.flex-direction-nav .next` is now `.flex-direction-nav .flex-next` by default. The namespacing property is exposed, free for you to change.

Expand Down
6 changes: 3 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "flexslider",
"version": "2.6.3",
"homepage": "https://github.com/woothemes/FlexSlider",
"version": "2.6.4",
"homepage": "https://github.com/woocommerce/FlexSlider",
"authors": [
"WooThemes <jeff@woothemes.com>"
"Automattic <jeff@woothemes.com>"
],
"description": "An awesome, fully responsive jQuery slider toolkit.",
"main": [
Expand Down
5 changes: 4 additions & 1 deletion changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,7 @@ FLEXSLIDER CHANGELOG
* Fixes the visibility of the pagination and the navigation in the "fade" mode.

2016.09.06 - Version 2.6.3
* Rollback fade fixes, due to harsh fade reports.
* Rollback fade fixes, due to harsh fade reports.

2017.07.08 - Version 2.6.4
* Fixes resize method call for orientationchange.
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "woothemes/FlexSlider",
"name": "woocommerce/FlexSlider",
"description": "An awesome, fully responsive jQuery slider toolkit.",
"keywords": ["flexslider","slider","jquery","woothemes","automattic"],
"homepage": "https://github.com/woothemes/FlexSlider"
"keywords": ["flexslider","slider","jquery","woocommerce","automattic"],
"homepage": "https://github.com/woocommerce/FlexSlider"
}
2 changes: 1 addition & 1 deletion flexslider.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* jQuery FlexSlider v2.6.3
* jQuery FlexSlider v2.6.4
* http://www.woothemes.com/flexslider/
*
* Copyright 2012 WooThemes
Expand Down
2 changes: 1 addition & 1 deletion flexslider.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* jQuery FlexSlider v2.6.3
* jQuery FlexSlider v2.6.4
* http://www.woothemes.com/flexslider/
*
* Copyright 2012 WooThemes
Expand Down
4 changes: 2 additions & 2 deletions jquery.flexslider-min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions jquery.flexslider.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* jQuery FlexSlider v2.6.3
* jQuery FlexSlider v2.6.4
* Copyright 2012 WooThemes
* Contributing Author: Tyler Smith
*/
Expand All @@ -18,7 +18,7 @@
var namespace = slider.vars.namespace,
msGesture = window.navigator && window.navigator.msPointerEnabled && window.MSGesture,
touch = (( "ontouchstart" in window ) || msGesture || window.DocumentTouch && document instanceof DocumentTouch) && slider.vars.touch,
// depricating this idea, as devices are being released with both of these events
// deprecating this idea, as devices are being released with both of these events
eventType = "click touchend MSPointerUp keyup",
watchedEvent = "",
watchedEventClearTimer,
Expand Down Expand Up @@ -145,7 +145,7 @@
if (touch && slider.vars.touch) { methods.touch(); }

// FADE&&SMOOTHHEIGHT || SLIDE:
if (!fade || (fade && slider.vars.smoothHeight)) { $(window).bind("resize orientationchange focus", methods.resize); }
if (!fade || (fade && slider.vars.smoothHeight)) { $(window).bind("resize orientationchange focus", methods.resize()); }

slider.find("img").attr("draggable", "false");

Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "flexslider",
"version": "2.6.3",
"version": "2.6.4",
"description": "An awesome, fully responsive jQuery slider toolkit.",
"main": "jquery.flexslider.js",
"scripts": {
Expand All @@ -14,15 +14,15 @@
"flexslider",
"jquery",
"slider",
"woothemes",
"woocommerce",
"automattic"
],
"author": "WooThemes <jeff@woothemes.com>",
"author": "Automattic <jeff@woothemes.com>",
"license": "GPL-2.0",
"bugs": {
"url": "https://github.com/woothemes/FlexSlider/issues"
"url": "https://github.com/woocommerce/FlexSlider/issues"
},
"homepage": "https://github.com/woothemes/FlexSlider#readme",
"homepage": "https://github.com/woocommerce/FlexSlider#readme",
"dependencies": {
"jquery": ">=1.11.3"
}
Expand Down

0 comments on commit 1a3a8ed

Please sign in to comment.