Skip to content

Commit 28e003c

Browse files
committed
Merge branch 'develop'
2 parents a1e3de5 + 33ee9ba commit 28e003c

File tree

14 files changed

+640
-662
lines changed

14 files changed

+640
-662
lines changed

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# [v4.0.0](https://github.com/Invis1ble/scrollbox/compare/v3.0.1...v4.0.0)
2+
3+
### Features
4+
5+
* Added table of contents to README.
6+
* Created CHANGELOG.
7+
8+
### Bug Fixes
9+
10+
* Fixed error in IE 7-8.
11+
12+
### Breaking changes from v3
13+
14+
* Default settings are now available via `$.fn.scrollbox.Constructor.getDefault()` instead of `$.fn.scrollbox.Constructor.Default`.

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module.exports = (grunt) => {
2222
babel: {
2323
options: {
2424
presets: [
25-
['es2015', { modules: false }]
25+
['es2015', { modules: false, loose: true }]
2626
]
2727
},
2828
production: {

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2013-2016 Invis1ble.
3+
Copyright (c) 2013-2017 Invis1ble.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,18 @@ A lightweight jQuery custom scrollbar plugin, that triggers event when reached t
1111

1212
[Demo Page](https://invis1ble.github.io/scrollbox/)
1313

14+
## Table of contents
15+
16+
- [Browser compatibility](#browser-compatibility)
17+
- [Installation](#installation)
18+
- [Usage](#usage)
19+
- [Basic features](#basic-features)
20+
- [Options](#options)
21+
- [Methods](#methods)
22+
- [Events](#events)
23+
- [Infinite scrolling implementation example](#infinite-scrolling-implementation-example)
24+
- [License](#license)
25+
1426
## Browser compatibility
1527

1628
* IE 7+
@@ -124,7 +136,7 @@ $('#long-content-container').scrollbox({
124136
or re-define default values for all instances:
125137

126138
```js
127-
$.fn.scrollbox.Constructor.Default.distanceToReach.y = 100;
139+
$.fn.scrollbox.Constructor.getDefault().distanceToReach.y = 100;
128140
```
129141

130142
#### startAt.x

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "invis1ble/scrollbox",
33
"description": "A lightweight jQuery custom scrollbar plugin, that triggers event when reached the defined point.",
4-
"version": "3.0.1",
4+
"version": "4.0.0",
55
"type": "component",
66
"keywords": [
77
"jquery",

dist/css/scrollbox.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
2-
* Scrollbox v3.0.1
3-
* (c) 2013-2016, Max Invis1ble
2+
* Scrollbox v4.0.0
3+
* (c) 2013-2017, Max Invis1ble
44
* Licensed under MIT (https://opensource.org/licenses/mit-license.php)
55
*/
66
.scrollbox-wrapper {

dist/css/scrollbox.min.css

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)