From 1a55db8d7b0869e2b67a13a6678d676e693870e5 Mon Sep 17 00:00:00 2001 From: Ariel Flesler Date: Wed, 18 Mar 2015 10:51:34 -0300 Subject: [PATCH] Version 1.4.0 compliant with jQuery.scrollTo 2.0 --- changes.txt => CHANGELOG | 4 ++++ LICENSE | 2 +- README.md | 7 +++++-- bower.json | 4 ++-- demo/ajax/index.html | 22 ++++++++++------------ demo/index.html | 17 ++++++++--------- demo/js/jquery.scrollTo.min.js | 6 +++--- jquery.localScroll.js | 21 ++++++++++----------- jquery.localScroll.min.js | 6 +++--- localScroll.jquery.json | 30 ------------------------------ package.json | 23 +++++++++++++++++++++++ 11 files changed, 69 insertions(+), 73 deletions(-) rename changes.txt => CHANGELOG (95%) delete mode 100644 localScroll.jquery.json create mode 100644 package.json diff --git a/changes.txt b/CHANGELOG similarity index 95% rename from changes.txt rename to CHANGELOG index 14c06c1..637857a 100644 --- a/changes.txt +++ b/CHANGELOG @@ -1,3 +1,7 @@ +1.4.0 +[Compat] +- Updated so it works with jQuery.scrollTo 2.0 + 1.3.5 [Fix] - Fixed when lazy true, links with 2+ levels of nested elements won't work, now using $().on() diff --git a/LICENSE b/LICENSE index 69c814d..fe5853e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ (The MIT License) -Copyright (c) 2007-2014 Ariel Flesler +Copyright (c) 2007-2015 Ariel Flesler Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/README.md b/README.md index e4a380c..6d85230 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,12 @@ bower install jquery.localScroll If you want the latest stable version, get the latest release from the [releases page](https://github.com/flesler/jquery.localScroll/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.4.0 and above. -* 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. diff --git a/bower.json b/bower.json index 848933e..57d36ad 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "jquery.localScroll", - "version": "1.3.5", + "version": "1.4.0", "description": "Animated anchor navigation made easy.", "homepage": "https://github.com/flesler/jquery.localScroll", "main": [ @@ -8,7 +8,7 @@ ], "dependencies": { "jquery": ">=1.8", - "jquery.scrollTo": ">=1.4.11" + "jquery.scrollTo": ">=2.0.0" }, "keywords": [ "browser", diff --git a/demo/ajax/index.html b/demo/ajax/index.html index 2846ee3..dcaa154 100644 --- a/demo/ajax/index.html +++ b/demo/ajax/index.html @@ -2,13 +2,13 @@ - jQuery.LocalScroll + jQuery.localScroll - + - - + + -

jQuery.LocalScroll by Ariel Flesler

+

jQuery.localScroll

AJAX Demo