Skip to content

Commit

Permalink
Fixing responsive race condition and bumping version
Browse files Browse the repository at this point in the history
  • Loading branch information
kenwheeler committed May 12, 2015
1 parent 5f2aa75 commit e3ecec1
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 15 deletions.
6 changes: 3 additions & 3 deletions README.markdown
Expand Up @@ -16,16 +16,16 @@ CDN hosted slick is a great way to get set up quick:
In your ```<head>``` add:

````
<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/jquery.slick/1.5.3/slick.css"/>
<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/jquery.slick/1.5.4/slick.css"/>
// Add the slick-theme.css if you want default styling
<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/jquery.slick/1.5.3/slick-theme.css"/>
<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/jquery.slick/1.5.4/slick-theme.css"/>
````

Then, before your closing ```<body>``` tag add:

```
<script type="text/javascript" src="//cdn.jsdelivr.net/jquery.slick/1.5.3/slick.min.js"></script>
<script type="text/javascript" src="//cdn.jsdelivr.net/jquery.slick/1.5.4/slick.min.js"></script>
```

#### Package Managers
Expand Down
2 changes: 1 addition & 1 deletion bower.json
@@ -1,7 +1,7 @@
{
"name": "slick-carousel",
"main": ["slick/slick.min.js", "slick/slick.css", "slick/slick-theme.css", "slick/fonts/*"],
"version": "1.5.3",
"version": "1.5.4",
"homepage": "https://github.com/kenwheeler/slick",
"authors": [
"Ken Wheeler <ken_wheeler@me.com>"
Expand Down
2 changes: 1 addition & 1 deletion component.json
Expand Up @@ -2,7 +2,7 @@
"name": "slick",
"repo": "kenwheeler/slick",
"description": "the last carousel you'll ever need",
"version": "1.5.3",
"version": "1.5.4",
"keywords": ["ui", "jquery", "carousel", "responsive", "slider"],
"dependencies": {
"component/jquery": "*"
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "slick-carousel",
"version": "1.5.3",
"version": "1.5.4",
"description": "the last carousel you'll ever need",
"main": "slick/slick.js",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion slick.jquery.json
Expand Up @@ -9,7 +9,7 @@
"touch",
"mobile"
],
"version": "1.5.3",
"version": "1.5.4",
"author": {
"name": "Ken Wheeler",
"url": "http://kenwheeler.github.io"
Expand Down
8 changes: 4 additions & 4 deletions slick/slick.js
Expand Up @@ -6,7 +6,7 @@
|___/_|_|\___|_|\_(_)/ |___/
|__/
Version: 1.5.3
Version: 1.5.4
Author: Ken Wheeler
Website: http://kenwheeler.github.io
Docs: http://kenwheeler.github.io/slick
Expand Down Expand Up @@ -192,10 +192,10 @@
// Extracted from jQuery v1.11 source
_.htmlExpr = /^(?:\s*(<[\w\W]+>)[^>]*)$/;

_.init(true);

_.checkResponsive(true);

_.init(true);

}

return Slick;
Expand Down Expand Up @@ -856,7 +856,7 @@
_.$slider.removeClass('slick-initialized');

_.unslicked = true;

if(!refresh) {
_.$slider.trigger('destroy', [_]);
}
Expand Down
7 changes: 3 additions & 4 deletions slick/slick.min.js

Large diffs are not rendered by default.

0 comments on commit e3ecec1

Please sign in to comment.