Skip to content

Commit

Permalink
merged in changes from coeamyd/master. Closes #33 and closes #34
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonathan Azoff committed Dec 11, 2011
1 parent 0a109dd commit f86cc67
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 9 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Overscroll v1.5.1.1
===================
Wednesday, December 7th 2011
Overscroll v1.5.2
=================
Sunday, December 11th 2011

Overscroll is a jQuery Plugin that emulates the iPhone scrolling experience in a browser. It is intended for use with the latest version of jQuery
<http://code.jquery.com/jquery-latest.js>
Expand Down Expand Up @@ -77,7 +77,7 @@ As of 1.4.4 you can call the `overscroll` constructor on a jQuery element as muc

Change Log
----------
* __1.5.1.1__
* __1.5.2__
- Added zIndex option for configuring thumb elements' z-index
+ <https://github.com/azoff/Overscroll/issues/33>
- Added handling of external scroll event for repositioning thumbs
Expand Down
4 changes: 2 additions & 2 deletions jquery.overscroll.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**@license
* Overscroll v1.5.1.1
* Overscroll v1.5.2
* A jQuery Plugin that emulates the iPhone scrolling experience in a browser.
* http://azoffdesign.com/overscroll
*
Expand All @@ -13,7 +13,7 @@
* For API documentation, see the README file
* http://azof.fr/pYCzuM
*
* Date: Wednesday, December 7th 2011
* Date: Sunday, December 11th 2011
*/

/*jslint onevar: true, strict: true */
Expand Down
20 changes: 17 additions & 3 deletions jquery.overscroll.min.js

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

0 comments on commit f86cc67

Please sign in to comment.