Skip to content
This repository was archived by the owner on Oct 16, 2024. It is now read-only.

Commit 1a3a8ed

Browse files
jeffikusjeffikus
authored
Merge pull request #1664 from woocommerce/release-2-6-4
Release 2 6 4
2 parents 0690ec2 + fb46868 commit 1a3a8ed

File tree

9 files changed

+32
-25
lines changed

9 files changed

+32
-25
lines changed

‎README.mdown

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
11
[![Gitter chat](https://badges.gitter.im/woothemes/FlexSlider.png)](https://gitter.im/woothemes/FlexSlider)
22

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

66
## Releases
77

8-
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.
8+
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.
99

1010
### Contributing
1111

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

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

1616
### Roadmap
1717

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

2020
## Updates
2121

22+
** Version 2.6.4 **
23+
24+
** Fixes resize method call for orientationchange. **
25+
2226
** Version 2.6.3 **
2327

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

67-
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!
71+
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!
6872

6973
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.
7074

‎bower.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"name": "flexslider",
3-
"version": "2.6.3",
4-
"homepage": "https://github.com/woothemes/FlexSlider",
3+
"version": "2.6.4",
4+
"homepage": "https://github.com/woocommerce/FlexSlider",
55
"authors": [
6-
"WooThemes <[email protected]>"
6+
"Automattic <[email protected]>"
77
],
88
"description": "An awesome, fully responsive jQuery slider toolkit.",
99
"main": [

‎changelog.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,7 @@ FLEXSLIDER CHANGELOG
4040
* Fixes the visibility of the pagination and the navigation in the "fade" mode.
4141

4242
2016.09.06 - Version 2.6.3
43-
* Rollback fade fixes, due to harsh fade reports.
43+
* Rollback fade fixes, due to harsh fade reports.
44+
45+
2017.07.08 - Version 2.6.4
46+
* Fixes resize method call for orientationchange.

‎composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "woothemes/FlexSlider",
2+
"name": "woocommerce/FlexSlider",
33
"description": "An awesome, fully responsive jQuery slider toolkit.",
4-
"keywords": ["flexslider","slider","jquery","woothemes","automattic"],
5-
"homepage": "https://github.com/woothemes/FlexSlider"
4+
"keywords": ["flexslider","slider","jquery","woocommerce","automattic"],
5+
"homepage": "https://github.com/woocommerce/FlexSlider"
66
}

‎flexslider.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery FlexSlider v2.6.3
2+
* jQuery FlexSlider v2.6.4
33
* http://www.woothemes.com/flexslider/
44
*
55
* Copyright 2012 WooThemes

‎flexslider.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery FlexSlider v2.6.3
2+
* jQuery FlexSlider v2.6.4
33
* http://www.woothemes.com/flexslider/
44
*
55
* Copyright 2012 WooThemes

‎jquery.flexslider-min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎jquery.flexslider.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* jQuery FlexSlider v2.6.3
2+
* jQuery FlexSlider v2.6.4
33
* Copyright 2012 WooThemes
44
* Contributing Author: Tyler Smith
55
*/
@@ -18,7 +18,7 @@
1818
var namespace = slider.vars.namespace,
1919
msGesture = window.navigator && window.navigator.msPointerEnabled && window.MSGesture,
2020
touch = (( "ontouchstart" in window ) || msGesture || window.DocumentTouch && document instanceof DocumentTouch) && slider.vars.touch,
21-
// depricating this idea, as devices are being released with both of these events
21+
// deprecating this idea, as devices are being released with both of these events
2222
eventType = "click touchend MSPointerUp keyup",
2323
watchedEvent = "",
2424
watchedEventClearTimer,
@@ -145,7 +145,7 @@
145145
if (touch && slider.vars.touch) { methods.touch(); }
146146

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

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

‎package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "flexslider",
3-
"version": "2.6.3",
3+
"version": "2.6.4",
44
"description": "An awesome, fully responsive jQuery slider toolkit.",
55
"main": "jquery.flexslider.js",
66
"scripts": {
@@ -14,15 +14,15 @@
1414
"flexslider",
1515
"jquery",
1616
"slider",
17-
"woothemes",
17+
"woocommerce",
1818
"automattic"
1919
],
20-
"author": "WooThemes <[email protected]>",
20+
"author": "Automattic <[email protected]>",
2121
"license": "GPL-2.0",
2222
"bugs": {
23-
"url": "https://github.com/woothemes/FlexSlider/issues"
23+
"url": "https://github.com/woocommerce/FlexSlider/issues"
2424
},
25-
"homepage": "https://github.com/woothemes/FlexSlider#readme",
25+
"homepage": "https://github.com/woocommerce/FlexSlider#readme",
2626
"dependencies": {
2727
"jquery": ">=1.11.3"
2828
}

0 commit comments

Comments
 (0)