Skip to content

Commit 2037cc1

Browse files
committed
*please do not use Release 1.4.3*
fixed kswedberg#21 (my dumb mistake). updated jQuery version in demos and improved bbq demo
1 parent 7317241 commit 2037cc1

File tree

4 files changed

+21
-20
lines changed

4 files changed

+21
-20
lines changed

demo/bbq.html

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ <h2>Smooth Scroll jQuery Plugin with Back Button Support</h2>
2525
<li><a href="#p3">p3</a></li>
2626
<li><a href="#p4">p4</a></li>
2727
<li><a href="#p5">p5</a></li>
28+
<li><a href="#">#</a></li>
29+
<li><a href="#not-here">not-here</a></li>
2830
</ul>
2931
<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>
3032
<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>
@@ -37,34 +39,32 @@ <h2>Smooth Scroll jQuery Plugin with Back Button Support</h2>
3739
<a href="#nav">back to nav</a>
3840
<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>
3941
<a href="#nav">back to nav</a>
40-
42+
4143
</div>
42-
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script>
43-
<script>!window.jQuery && document.write(unescape('%3Cscript src="/lib/jquery.js"%3E%3C/script%3E'));</script>
44+
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>
45+
<script>!window.jQuery && document.write(unescape('%3Cscript src="../lib/jquery.js"%3E%3C/script%3E'));</script>
4446
<script src="../jquery.smooth-scroll.js"></script>
4547
<script src="../lib/jquery.ba-bbq.js"></script>
4648
<script>
4749
$(document).ready(function() {
48-
50+
4951
$('a[href*="#"]').live('click', function() {
50-
$.bbq.pushState( '#/' + this.hash.slice(1) );
51-
return false;
52+
if ( this.hash ) {
53+
$.bbq.pushState( '#/' + this.hash.slice(1) );
54+
return false;
55+
}
5256
});
53-
57+
5458
$(window).bind('hashchange', function(event) {
55-
56-
if (location.hash) {
57-
var tgt = location.hash.replace(/#\//,'');
58-
} else {
59-
var tgt = '#top';
59+
var tgt = location.hash.replace(/^#\/?/,'');
60+
if ( document.getElementById(tgt) ) {
61+
$.smoothScroll({scrollTarget: '#' + tgt});
6062
}
61-
$.smoothScroll({scrollTarget: '#' + tgt});
6263
});
63-
64+
6465
$(window).trigger('hashchange');
6566
});
66-
6767
</script>
68-
68+
6969
</body>
7070
</html>

demo/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
width: 180px;
2525
}
2626
</style>
27-
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6/jquery.js"></script>
27+
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>
2828
<script>!window.jQuery && document.write(unescape('%3Cscript src="../lib/jquery.js"%3E%3C/script%3E'));</script>
2929

3030
<script src="../jquery.smooth-scroll.js" type="text/javascript"></script>

demo/stop.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
margin-left: -100px;
2929
}
3030
</style>
31-
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6/jquery.js"></script>
31+
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>
3232
<script>!window.jQuery && document.write(unescape('%3Cscript src="../lib/jquery.js"%3E%3C/script%3E'));</script>
3333

3434
<script src="../jquery.smooth-scroll.js" type="text/javascript"></script>

jquery.smooth-scroll.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ var version = '1.4.3',
3131
speed: 400
3232
},
3333

34-
locationPath = $.smoothScroll.filterPath(location.pathname),
3534
getScrollable = function(opts) {
3635
var scrollable = [],
3736
scrolled = false,
@@ -76,7 +75,9 @@ $.fn.extend({
7675

7776
smoothScroll: function(options) {
7877
options = options || {};
79-
var opts = $.extend({}, $.fn.smoothScroll.defaults, options);
78+
var opts = $.extend({}, $.fn.smoothScroll.defaults, options),
79+
locationPath = $.smoothScroll.filterPath(location.pathname);
80+
8081
this.die('click.smoothscroll').live('click.smoothscroll', function(event) {
8182

8283
var clickOpts = {}, link = this, $link = $(this),

0 commit comments

Comments
 (0)