Skip to content

Commit 9f0b429

Browse files
logicboxlogicbox
committed
Merge branch 'develop'
2 parents d40f21a + dcba532 commit 9f0b429

30 files changed

+2532
-429
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.idea
2+
node_modules
3+
yarn-error.log

‎LICENSE.md

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
The MIT License (MIT)
2+
Copyright (c) 2018 Will Kelly
3+
4+
Permission is hereby granted, free of charge, to any person obtaining a copy
5+
of this software and associated documentation files (the "Software"), to deal
6+
in the Software without restriction, including without limitation the rights
7+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
copies of the Software, and to permit persons to whom the Software is
9+
furnished to do so, subject to the following conditions:
10+
11+
The above copyright notice and this permission notice shall be included in all
12+
copies or substantial portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
17+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
18+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
19+
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
20+
OR OTHER DEALINGS IN THE SOFTWARE.

‎README.md

+24-13
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,47 @@
11
jQuery simplyScroll 2
22
=====================
33

4-
2.0.5 20/05/12. Created by Will Kelly [@logicbox](http://twitter.com/logicbox)
4+
## About
5+
6+
Created by Will Kelly [@logicbox](http://twitter.com/logicbox)
57

68
simplyScroll is a jQuery plugin that can animate (scroll) a set of elements either automatically or manually,
79
horizontally or vertically, forwards or backwards. This plugin can be performance intensive, so speed and
810
framerate are fully configureable to accommodate lower spec systems.
911

10-
## New in V2 ##
11-
12-
* Auto-scroll in either direction
13-
* RTL support, normalises browser RTL scroll implementations
14-
* Touch support
15-
* Now supports unequal sized elements in loop mode
16-
* Pause/resume
17-
1812
## Features ##
1913

2014
* Supports scrolling both horizontally and vertically both forwards and backwards
2115
* Uses DOM ScrollTop/ScrollLeft for optimal performance
16+
* RTL support, normalises browser RTL scroll implementations
2217
* Supports looped scrolling (infinite effect)
2318
* Fully customisable via CSS & HTML
24-
* jQuery 1.2.6 and higher, tested up-to 1.7.1
25-
* Works on all major browsers (including IE6/7!)
19+
* jQuery 1.2.6 and higher all the way
20+
* Works on all modern browsers
21+
22+
[View plugin site for download links, examples and more info](http://logicbox.net/jquery/simplyscroll/)
2623

27-
[View plugin site for examples and more info](http://logicbox.net/jquery/simplyscroll/)
24+
## Install
25+
26+
`yarn add jquery-simplyscroll` or `npm install jquery-simplyscroll`
2827

2928
## Version History ##
3029

30+
* 2.1.0 15/07/18 - NPM support, install & build process + requestAnimationFrame fix
31+
* 2.0.6 23/06/18 - Added initialOffset & replaced setInterval with requestAnimationFrame
3132
* 2.0.5 20/05/12 - Bounce mode fixed. Touch scroll works as expected, disabled when links are present
3233
* 2.0.4 24/02/12 - Fixed a bug in manual loop mode
3334
* 2.0.3 11/02/12 - Simplified touch detection to counter a Chrome 17 false positive
3435
* 2.0.2 09/02/12 - Scroll button bug when using mulitple scrollers
3536
* 2.0.1 01/02/12 - Fixed touch support
36-
* 2.0.0 31/01/12 - Initial release
37+
* 2.0.0 31/01/12 - Initial release
38+
39+
## Contributors ##
40+
41+
Thanks to all who over in the years have used, given feedback and contributed to this plugin. Including recently:
42+
43+
Paloaltowil (https://github.com/paloaltowil)
44+
45+
Zevero (https://github.com/zevero)
46+
47+
Bre7 (https://github.com/bre7)

‎test/test.html renamed to ‎examples/test.html

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<!doctype html>
22
<html>
33
<head>
4-
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
5-
<title>jQuery simplyScroll - Logicbox</title>
6-
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js">
7-
</script>
8-
<!--<script type="text/javascript" src="/js/common.js"></script>-->
9-
<script type="text/javascript" src="../jquery.simplyscroll.js"></script>
10-
<link rel="stylesheet" href="../jquery.simplyscroll.css" media="all" type="text/css">
11-
<script type="text/javascript">
12-
(function($) {
13-
$(function() {
14-
$("#scroller").simplyScroll();
15-
});
16-
})(jQuery);
17-
</script>
4+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
5+
<title>jQuery simplyScroll - Logicbox</title>
6+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js">
7+
</script>
8+
<!--<script type="text/javascript" src="/js/common.js"></script>-->
9+
<script type="text/javascript" src="../jquery.simplyscroll.js"></script>
10+
<link rel="stylesheet" href="../jquery.simplyscroll.css" media="all" type="text/css">
11+
<script type="text/javascript">
12+
(function($) {
13+
$(function() {
14+
$("#scroller").simplyScroll();
15+
});
16+
})(jQuery);
17+
</script>
1818
</head>
1919

2020
<body>
@@ -28,6 +28,6 @@
2828
<li><img src="http://logicbox.net/jquery/simplyscroll/assets/20080608_38CG51J2_tb.jpg" width="290" height="200" alt="Firehouse"></li>
2929
</ul>
3030

31-
31+
3232
</body>
3333
</html>

‎test/test_bounce.html renamed to ‎examples/test_bounce.html

File renamed without changes.

‎test/test_control.html renamed to ‎examples/test_control.html

File renamed without changes.

‎test/test_control_rtl.html renamed to ‎examples/test_control_rtl.html

File renamed without changes.

‎test/test_framerate60.html renamed to ‎examples/test_framerate60.html

File renamed without changes.

‎test/test_horz_back.html renamed to ‎examples/test_horz_back.html

File renamed without changes.

‎test/test_manual.html renamed to ‎examples/test_manual.html

File renamed without changes.

‎test/test_manual_loop.html renamed to ‎examples/test_manual_loop.html

File renamed without changes.

‎test/test_min.html renamed to ‎examples/test_min.html

File renamed without changes.

‎test/test_pause.html renamed to ‎examples/test_pause.html

File renamed without changes.

‎test/test_pausehover.html renamed to ‎examples/test_pausehover.html

File renamed without changes.

‎test/test_pausetouch.html renamed to ‎examples/test_pausetouch.html

File renamed without changes.

‎test/test_pausetouch_links.html renamed to ‎examples/test_pausetouch_links.html

File renamed without changes.

‎test/test_rtl.html renamed to ‎examples/test_rtl.html

File renamed without changes.

‎test/test_unequal.html renamed to ‎examples/test_unequal.html

File renamed without changes.

‎test/test_vert.html renamed to ‎examples/test_vert.html

File renamed without changes.

‎test/test_vert_back.html renamed to ‎examples/test_vert_back.html

File renamed without changes.

‎test/test_vert_manual.html renamed to ‎examples/test_vert_manual.html

File renamed without changes.

‎test/test_vert_manual_600.html renamed to ‎examples/test_vert_manual_600.html

File renamed without changes.

‎test/test_vert_manual_loop.html renamed to ‎examples/test_vert_manual_loop.html

File renamed without changes.

‎test/test_vert_manual_multi.html renamed to ‎examples/test_vert_manual_multi.html

File renamed without changes.

‎index.html

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<!doctype html>
2+
<html>
3+
<head>
4+
<title>npm and jQuery demo</title>
5+
<link rel="stylesheet" href="./jquery.simplyscroll.css" />
6+
</head>
7+
8+
<body>
9+
10+
<ul id="scroller">
11+
<li><img src="http://logicbox.net/jquery/simplyscroll/assets/20080608_9N3H5GYL_tb.jpg" width="290" height="200" alt="Firehouse"></li>
12+
<li><img src="http://logicbox.net/jquery/simplyscroll/assets/20080513_4D3SD1BQ_tb.jpg" width="290" height="200" alt="Chloe nightclub"></li>
13+
<li><img src="http://logicbox.net/jquery/simplyscroll/assets/20080513_VPJWVQRW_tb.jpg" width="290" height="200" alt="Firehouse bar"></li>
14+
<li><img src="http://logicbox.net/jquery/simplyscroll/assets/20080514_B1YJ08B6_tb.jpg" width="290" height="200" alt="Firehouse chloe club fishtank"></li>
15+
<li><img src="http://logicbox.net/jquery/simplyscroll/assets/20080514_JYW68XPT_tb.jpg" width="290" height="200" alt="Firehouse restaurant"></li>
16+
<li><img src="http://logicbox.net/jquery/simplyscroll/assets/20080608_38CG51J2_tb.jpg" width="290" height="200" alt="Firehouse"></li>
17+
</ul>
18+
19+
<script src="./bundle.js"></script>
20+
</body>
21+
</html>

‎index.js

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
var jQuery = require('jquery');
2+
require('./jquery.simplyscroll');
3+
4+
(function($) {
5+
$(function() {
6+
$("#scroller").simplyScroll({
7+
speed: 1
8+
});
9+
});
10+
})(jQuery);

0 commit comments

Comments
 (0)