Skip to content

Commit 790efe6

Browse files
kswedbergkswedberg
committed
Merge branch 'master' into gh-pages
2 parents 785b7c7 + ab98c96 commit 790efe6

File tree

7 files changed

+1814
-16
lines changed

7 files changed

+1814
-16
lines changed

‎demo/jq3.html

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<title>Smooth Scroll jQuery Plugin Demo</title>
6+
<style type="text/css">
7+
body {
8+
font-family: Helvetica, Arial, sans-serif;
9+
}
10+
.container {
11+
margin: 40px auto;
12+
width: 200px;
13+
}
14+
.scrollme {
15+
height: 100px;
16+
width: 180px;
17+
overflow: auto;
18+
padding-left: 8px;
19+
border: 1px solid #999;
20+
}
21+
.scrollme-x {
22+
width: 400px;
23+
}
24+
.scrollme-x div,
25+
.scrollme-x p {
26+
float: left;
27+
width: 180px;
28+
}
29+
</style>
30+
31+
<script src="http://code.jquery.com/jquery-3.1.0.js" integrity="sha256-slogkvB1K3VOkzAI8QITxV3VzpOnkeNVsKvtkYLMjfk=" crossorigin="anonymous"></script>
32+
<script src="../lib/jquery/ui-easing.js"></script>
33+
<script src="http://code.jquery.com/jquery-migrate-3.0.0.js" integrity="sha256-lsVOB+3Yhm6He5MkTO3Bw/Xw4NXK7wYYTi1Y+M/2PrM=" crossorigin="anonymous"></script>
34+
<script src="../src/jquery.smooth-scroll.js"></script>
35+
<script>
36+
$(document).ready(function() {
37+
38+
$('body').smoothScroll({
39+
delegateSelector: 'ul.mainnav a',
40+
easing: 'easeOutBounce',
41+
speed: 2000,
42+
complete: function() {
43+
console.log('done!')
44+
}
45+
});
46+
47+
$('p.subnav a').click(function(event) {
48+
event.preventDefault();
49+
var link = this;
50+
$.smoothScroll({
51+
scrollTarget: link.hash
52+
});
53+
});
54+
55+
$('#change-speed').on('click', function() {
56+
var $p1 = $('ul.mainnav a').first();
57+
var p1Opts = $p1.smoothScroll('options') || {};
58+
59+
p1Opts.speed = p1Opts.speed === 1400 ? 400 : 1400;
60+
$p1.smoothScroll('options', p1Opts);
61+
});
62+
63+
$('button.scrollsomething').on('click', function(event) {
64+
event.preventDefault();
65+
$.smoothScroll({
66+
scrollElement: $('div.scrollme'),
67+
scrollTarget: '#findme'
68+
});
69+
});
70+
$('button.scrollhorz').on('click', function(event) {
71+
event.preventDefault();
72+
$.smoothScroll({
73+
direction: 'left',
74+
scrollElement: $('div.scrollme'),
75+
scrollTarget: '.horiz'
76+
});
77+
78+
});
79+
80+
});
81+
82+
</script>
83+
</head>
84+
<body>
85+
<div class="container">
86+
<p>Scroll the Document to one of the following paragraphs:</p>
87+
<ul class="mainnav">
88+
<li><a href="#p1">p1</a></li>
89+
<li><a href="#p2">p2</a></li>
90+
<li><a href="#p3">p3</a></li>
91+
<li><a href="#p4">p4</a></li>
92+
<li><a href="#p5">p5</a></li>
93+
<li><a href="#foo">link to nowhere</a></li>
94+
<li><a href="bbq.html#p5">bbq.html#p5</a></li>
95+
</ul>
96+
<p><a href="bbq.html">Try it with jQuery BBQ hashchange support</a></p>
97+
<p>Or, <a href="hashchange.html">native hashchange support (IE9+)</a></p>
98+
<p>Toggle scrolling speed for the p1 link <button id="change-speed">Change speed option</button></p>
99+
<button class="scrollsomething">Scroll vertically</button>
100+
<button class="scrollhorz">Scroll horizontally</button>
101+
102+
<div class="scrollme">
103+
<div class="scrollme-x">
104+
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
105+
</p>
106+
<div class="horiz">
107+
You found me by scrolling horizontally. nice job!
108+
</div>
109+
</div>
110+
<p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
111+
</p>
112+
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
113+
</p>
114+
<p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
115+
</p>
116+
<div class="scrollme-x">
117+
<p id="findme">YOU FOUND ME! Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
118+
</p>
119+
<div class="horiz">
120+
You scrolled horizontally <em>and</em> vertically. Awesome!
121+
</div>
122+
</div>
123+
<p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
124+
</p>
125+
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
126+
</p>
127+
<p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
128+
</p>
129+
</div>
130+
131+
<p id="p1">p1 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
132+
<p id="p2">p2 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
133+
<p id="p3">p3 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
134+
<p id="p4">p4 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
135+
<p id="p5">p5 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
136+
<p id="p6">p6 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
137+
<p class="subnav"><a href="#p1">p1</a> <a href="#p2">p2</a> <a href="#p3">p3</a> <a href="#p4">p4</a></p>
138+
139+
</div>
140+
</body>
141+
</html>

‎jquery.smooth-scroll.js

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* jQuery Smooth Scroll - v1.7.2 - 2016-01-23
2+
* jQuery Smooth Scroll - v2.0.0 - 2016-07-31
33
* https://github.com/kswedberg/jquery-smooth-scroll
44
* Copyright (c) 2016 Karl Swedberg
55
* Licensed MIT
@@ -18,7 +18,7 @@
1818
}
1919
}(function($) {
2020

21-
var version = '1.7.2';
21+
var version = '2.0.0';
2222
var optionOverrides = {};
2323
var defaults = {
2424
exclude: [],
@@ -46,7 +46,14 @@
4646
// fn(opts) function to be called after scrolling occurs.
4747
// `this` is the triggering element
4848
afterScroll: function() {},
49+
50+
// easing name. jQuery comes with "swing" and "linear." For others, you'll need an easing plugin
51+
// from jQuery UI or elsewhere
4952
easing: 'swing',
53+
54+
// speed can be a number or 'auto'
55+
// if 'auto', the speed will be calculated based on the formula:
56+
// (current scroll position - target scroll position) / autoCoeffic
5057
speed: 400,
5158

5259
// coefficient for "auto" speed
@@ -203,12 +210,12 @@
203210

204211
if (options.delegateSelector !== null) {
205212
this
206-
.undelegate(options.delegateSelector, 'click.smoothscroll')
207-
.delegate(options.delegateSelector, 'click.smoothscroll', clickHandler);
213+
.off('click.smoothscroll', options.delegateSelector)
214+
.on('click.smoothscroll', options.delegateSelector, clickHandler);
208215
} else {
209216
this
210-
.unbind('click.smoothscroll')
211-
.bind('click.smoothscroll', clickHandler);
217+
.off('click.smoothscroll')
218+
.on('click.smoothscroll', clickHandler);
212219
}
213220

214221
return this;

‎jquery.smooth-scroll.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.

0 commit comments

Comments
 (0)