Skip to content

Commit

Permalink
Version 1.3.0 compatible with scrollTo 2.0 and above
Browse files Browse the repository at this point in the history
  • Loading branch information
@flesler
flesler committed Mar 18, 2015
1 parent f60e3d3 commit 3692fbc
Show file tree
Hide file tree
Showing 8 changed files with 144 additions and 122 deletions.
4 changes: 4 additions & 0 deletions changes.txt → CHANGELOG
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
1.3.0
[Compat]
- Updated to work with jQuery.scrollTo 2.0

1.2.4.1
[Misc]
- Using $.isNumeric instead of isNaN
Expand Down
19 changes: 12 additions & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
# jQuery.SerialScroll

### Installation and usage

Using [bower](https://github.com/twitter/bower):
Via [bower](https://github.com/twitter/bower):
```bash
bower install jquery.serialScroll
```
Via [npm](https://www.npmjs.com/package/jquery.serialscroll):
```bash
npm install jquery.serialscroll
```

### Downloading Manually

If you want the latest stable version, get the latest release from the [releases page](https://github.com/flesler/jquery.serialScroll/releases).

### Notes
### jQuery.scrollTo

This plugin requires [jQuery.scrollTo](http://github.com/flesler/jquery.scrollTo).
In order to use jQuery.scrollTo 2.0 you need to update jQuery.localScroll to 1.3.0 and above.

* The plugin requires jQuery.ScrollTo. http://github.com/flesler/jquery.scrollTo
### Notes

* The hash of settings is passed in to jQuery.ScrollTo, so, in addition to jQuery.LocalScroll's settings, you can use any of jQuery.ScrollTo's. Check that plugin's documentation for further information.
* The hash of settings is passed in to jQuery.scrollTo, so, in addition to jQuery.localScroll's settings, you can use any of jQuery.scrollTo's. Check that plugin's documentation for further information.

* Most of this plugin's defaults, belong to jQuery.ScrollTo, check it's demo for an example of each option.
* Most of this plugin's defaults, belong to jQuery.scrollTo, check it's demo for an example of each option.
6 changes: 3 additions & 3 deletions component.json → bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "jquery.serialScroll",
"version": "1.2.4",
"description": "Animated scrolling of series.",
"version": "1.3.0",
"description": "Animated scrolling of series with jQuery",
"homepage": "https://github.com/flesler/jquery.serialScroll",
"main": [
"./jquery.serialScroll.js",
"./jquery.serialScroll.min.js"
],
"dependencies": {
"jquery" : ">=1.8",
"jquery.scrollTo" : ">=1.4.3"
"jquery.scrollTo" : ">=2.1.0"
},
"keywords": [ "slideshow", "sequence", "animated", "animation", "scrolling", "scroll", "prev", "next" ],
"author": {
Expand Down
40 changes: 20 additions & 20 deletions demo/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<meta name="robots" content="index,follow" />
<link type="text/css" rel="stylesheet" href="css/style.css" />
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
<script type="text/javascript" src="../jquery.scrollTo.js"></script>
<script type="text/javascript" src="./js/jquery.scrollTo.min.js"></script>
<script type="text/javascript" src="../jquery.serialScroll.js"></script>
<script type="text/javascript">
// Easing equation, borrowed from jQuery easing plugin
Expand Down Expand Up @@ -70,8 +70,9 @@
*/
//those arguments with a $ are jqueryfied, elem isn't.
e.preventDefault();
if( this.blur )
if (this.blur) {
this.blur();
}
},
onAfter:function( elem ){
//'this' is the element being scrolled ($pane) not jqueryfied
Expand Down Expand Up @@ -143,7 +144,7 @@
</style>
</head>
<body>
<h1>jQuery.SerialScroll&nbsp;<strong>by Ariel Flesler</strong></h1>
<h1>jQuery.SerialScroll</h1>
<div id="screen">
<img class="prev" src="img/prev.gif" alt="prev" width="42" height="53" />
<div id="navigation">
Expand Down Expand Up @@ -199,20 +200,19 @@ <h2>Section 5</h2>
</div>
<div id="slideshow">
<ul>
<li><img width="225" height="300" src="http://www.stockvault.net/watermark.php?i=9020" /></li>
<li><img width="225" height="300" src="http://www.stockvault.net/watermark.php?i=8430" /></li>
<li><img width="225" height="300" src="http://www.stockvault.net/watermark.php?i=7898" /></li>
<li><img width="225" height="300" src="http://www.stockvault.net/watermark.php?i=7894" /></li>
<li><img width="225" height="300" src="http://www.stockvault.net/watermark.php?i=3526" /></li>
<li><img width="225" height="300" src="http://www.stockvault.net/watermark.php?i=7863" /></li>
<li><img width="225" height="300" src="http://www.stockvault.net/watermark.php?i=7743" /></li>
<li><img width="225" height="300" src="http://www.stockvault.net/watermark.php?i=7150" /></li>
<li><img width="225" height="300" src="http://www.stockvault.net/watermark.php?i=7164" /></li>
<li><img width="225" height="300" src="http://www.stockvault.net/watermark.php?i=7149" /></li>
<li><img width="225" height="300" src="http://www.stockvault.net/watermark.php?i=4922" /></li>
<li><img width="225" height="300" src="http://www.stockvault.net/watermark.php?i=9307" /></li>
<li><img width="225" height="300" src="http://www.stockvault.net/watermark.php?i=9922" /></li>
<li><img width="225" height="300" src="http://www.stockvault.net/watermark.php?i=9976" /></li>
<li><img width="225" height="300" src="http://lorempixel.com/225/300/abstract" /></li>
<li><img width="225" height="300" src="http://lorempixel.com/225/300/animals" /></li>
<li><img width="225" height="300" src="http://lorempixel.com/225/300/business" /></li>
<li><img width="225" height="300" src="http://lorempixel.com/225/300/cats" /></li>
<li><img width="225" height="300" src="http://lorempixel.com/225/300/city" /></li>
<li><img width="225" height="300" src="http://lorempixel.com/225/300/food" /></li>
<li><img width="225" height="300" src="http://lorempixel.com/225/300/nightlife" /></li>
<li><img width="225" height="300" src="http://lorempixel.com/225/300/fashion" /></li>
<li><img width="225" height="300" src="http://lorempixel.com/225/300/people" /></li>
<li><img width="225" height="300" src="http://lorempixel.com/225/300/nature" /></li>
<li><img width="225" height="300" src="http://lorempixel.com/225/300/sports" /></li>
<li><img width="225" height="300" src="http://lorempixel.com/225/300/technics" /></li>
<li><img width="225" height="300" src="http://lorempixel.com/225/300/transport" /></li>
</ul>
</div>
</div>
Expand Down Expand Up @@ -285,9 +285,9 @@ <h4>News 8</h4>
<div id="links">
<h3>Links</h3>
<ul>
<li><a target="_blank" href="http://plugins.jquery.com/project/SerialScroll">Project Page</a></li>
<li><a target="_blank" href="http://flesler.blogspot.com/2008/02/jqueryserialscroll.html">Blog entry</a></li>
<li><a href="http://flesler.webs.com/jQuery.ScrollTo/" rel="prev" rev="next" type="text/html">jQuery.ScrollTo's Demo</a></li>
<li><a target="_blank" href="https://github.com/flesler/jquery.serialScroll">Github</a></li>
<li><a target="_blank" href="http://flesler.blogspot.com/2008/02/jqueryserialscroll.html">Documentation</a></li>
<li><a href="http://demos.flesler.com/jquery/scrollTo/" rel="prev" rev="next" type="text/html">jQuery.scrollTo's Demo</a></li>
</ul>
</div>
</body>
Expand Down
7 changes: 7 additions & 0 deletions demo/js/jquery.scrollTo.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3692fbc

Please sign in to comment.