Skip to content

Commit 8f7bc82

Browse files
authored
Merge pull request #332 from webcreate/release-3.0.0-beta.3
Release 3.0.0-beta.3 Public Beta
2 parents 33e0096 + 6fd206f commit 8f7bc82

File tree

128 files changed

+6724
-5565
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+6724
-5565
lines changed

.eslintrc.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"plugins": [
3+
"cypress"
4+
],
5+
"env": {
6+
"es6": true,
7+
"cypress/globals": true
8+
},
9+
"extends": "eslint:recommended",
10+
"parserOptions": {
11+
"sourceType": "module"
12+
},
13+
"rules": {
14+
"no-cond-assign": 2,
15+
"no-console": 1,
16+
"no-const-assign": 2,
17+
"no-class-assign": 2,
18+
"no-this-before-super": 2,
19+
"no-unused-vars": 1,
20+
"no-var": 2,
21+
"object-shorthand": [2, "always"]
22+
}
23+
}

.gitbook.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
root: ./docs/
2+
3+
structure:
4+
readme: README.md
5+
summary: README.md

.gitignore

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
node_modules/
2-
bower_components/
3-
dist/
4-
conveyor.yml
5-
/vendor/
6-
composer.lock
7-
package-lock.json
1+
dist
2+
node_modules
3+
test/screenshots
4+
test/videos
5+
.build

.travis.yml

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,27 @@
1-
sudo: false
1+
sudo: required
22

3-
addons:
4-
firefox: 53.0
5-
6-
before_script:
7-
- npm install -g bower
8-
- bower install --production
9-
- bower install --force jquery#$JQUERY_VERSION
10-
- ./node_modules/.bin/grunt build
11-
- export DISPLAY=:99.0
12-
- sh -e /etc/init.d/xvfb start
13-
- sleep 5
14-
- ./node_modules/.bin/grunt buster::server:block &
15-
- sleep 5
16-
- firefox http://localhost:1111/capture &
17-
- sleep 5
3+
language: node_js
184

19-
script:
20-
- "./node_modules/.bin/grunt buster::test"
5+
node_js:
6+
- 10
217

22-
language: node_js
8+
addons:
9+
apt:
10+
packages:
11+
- libgconf-2-4 # required for cypress
2312

2413
cache:
14+
npm: true
2515
directories:
26-
- node_modules # NPM packages
16+
- "$HOME/.cache"
2717

28-
node_js:
29-
- 0.10
18+
install:
19+
- npm ci
20+
- npm run build
3021

31-
env:
32-
- JQUERY_VERSION=^1.12
33-
- JQUERY_VERSION=^2.0
34-
- JQUERY_VERSION=^3.0
22+
before_script:
23+
- ./node_modules/.bin/http-server -p 8080 ./ --silent &
24+
25+
script:
26+
- npm run lint
27+
- cypress run --record --key $CYPRESS_KEY

CHANGELOG.md

Lines changed: 60 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,83 @@
11
Changelog
22
=========
33

4-
## 2.3.1
4+
All notable changes to this project will be documented in this file.
5+
6+
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
7+
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
8+
9+
## [Unreleased]
10+
11+
Complete rewrite of Infinite Ajax Scroll.
12+
13+
Key features:
14+
15+
- Embraces package managers
16+
- Dropped jQuery dependency
17+
- Vanilla Javascript (ES6)
18+
- New and improved test suites
19+
- New and improved documentation and examples
20+
- Improved developer experience
21+
22+
**This version is incompatible with previous versions.**
23+
Read [UPGRADE.md](UPGRADE.md) for upgrade instructions.
24+
25+
**This version changes the license from MIT to GNU Affero General Public License v3.0.**
26+
See [LICENSE](LICENSE) for more details.
27+
28+
## [2.3.1]
529

630
* Fix: noneLeft event not being triggered when there was only one page
731

8-
## 2.3.0
32+
## [2.3.0]
933

1034
* Added new option: `initialize`
11-
* Fix: `ready` event to fire when ready (see commit f6b44a7)
12-
* Added `ajaxOptions` to `load` event (PR by campadrenalin)
35+
* Fix: `ready` event to fire when ready (see commit [f6b44a7](https://github.com/webcreate/infinite-ajax-scroll/commit/f6b44a74e3b87362d0c5b417cf5ba69b6a048bd3))
36+
* Added `ajaxOptions` to `load` event (PR by [campadrenalin](https://github.com/campadrenalin))
1337

14-
## 2.2.3
38+
## [2.2.3]
1539

1640
* Improved documentation
17-
* Fix: Cannot read property 'Deferred' of undefined (in jQuery noConflict mode) (fixes #188, #271, #291)
41+
* Fix: Cannot read property 'Deferred' of undefined (in jQuery noConflict mode) (fixes [#188](https://github.com/webcreate/infinite-ajax-scroll/issues/188), [#271](https://github.com/webcreate/infinite-ajax-scroll/issues/271), [#291](https://github.com/webcreate/infinite-ajax-scroll/issues/291))
1842

19-
## 2.2.2
43+
## [2.2.2]
2044

21-
* Fix: render callback is not executed when using a custom render function (fixes #198)
22-
* Fix: unpredictable behaviour when multiple instances used the same selectors for sub-elements (fixes #93)
45+
* Fix: render callback is not executed when using a custom render function (fixes [#198](https://github.com/webcreate/infinite-ajax-scroll/issues/198))
46+
* Fix: unpredictable behaviour when multiple instances used the same selectors for sub-elements (fixes [#93](https://github.com/webcreate/infinite-ajax-scroll/issues/93))
2347
* Stop ajax responder if instance was destroyed or reinitialized
2448

25-
## 2.2.1
49+
## [2.2.1]
2650

27-
* Fix: prevent multiple initialisations causing duplicate items (fixes #175, #183)
51+
* Fix: prevent multiple initialisations causing duplicate items (fixes [#175](https://github.com/webcreate/infinite-ajax-scroll/issues/175), [#183](https://github.com/webcreate/infinite-ajax-scroll/issues/183))
2852

29-
## 2.2.0
53+
## [2.2.0]
3054

3155
* Improved documentation on delay and negativeMargin options
3256
* Added FAQ to support documentation
3357
* Added Wordpress cookbook
34-
* Fix: Maintain history state object when changing pages (longzheng)
35-
* Fix: no longer caching $itemsContainer (fixes #153)
36-
* Fix: really destroy instance on destroy method (fixes #160)
37-
* Fix: Replaced deprecated size() with .length (fixes #162)
58+
* Fix: Maintain history state object when changing pages ([longzheng](https://github.com/longzheng))
59+
* Fix: no longer caching $itemsContainer (fixes [#153](https://github.com/webcreate/infinite-ajax-scroll/issues/153))
60+
* Fix: really destroy instance on destroy method (fixes [#160](https://github.com/webcreate/infinite-ajax-scroll/issues/160))
61+
* Fix: Replaced deprecated size() with .length (fixes [#162](https://github.com/webcreate/infinite-ajax-scroll/issues/162))
3862
* Fix: Reworked binding and unbinding (fixes various issues with unbinding)
39-
* Fix: Bail out when device doesn't support onScroll event (like Opera Mini) (fixes #146 by fflewddur)
63+
* Fix: Bail out when device doesn't support onScroll event (like Opera Mini) (fixes [#146](https://github.com/webcreate/infinite-ajax-scroll/issues/146) by [fflewddur](https://github.com/fflewddur))
4064
* Added reinitialize method
4165

42-
## 2.1.3
66+
## [2.1.3]
4367

44-
* Bug #152 Improve compatibility support when Prototype is used along with jQuery (antoinekociuba)
68+
* Bug #152 Improve compatibility support when Prototype is used along with jQuery ([antoinekociuba](https://github.com/antoinekociuba))
4569
* Added docs
4670

47-
## 2.1.2
71+
## [2.1.2]
4872

4973
* Added `htmlPrev` and `textPrev` options to IASTriggerExtension
5074

51-
## 2.1.1
75+
## [2.1.1]
5276

5377
* Changed argument of `load` event from url to event object
5478
* Fixed `prev()` return value
5579

56-
## 2.1.0
80+
## [2.1.0]
5781

5882
* Added History extension
5983
* Added `ready` event
@@ -63,9 +87,22 @@ Changelog
6387
* Added `initialize` call for extensions
6488
* Added `one` method
6589

66-
## 2.0.0
90+
## [2.0.0]
6791

6892
* Completely rewritten
6993
* Extensible through extensions
7094
* Extensible through events
7195
* Added an extensive test suite
96+
97+
[Unreleased]: https://github.com/webcreate/infinite-ajax-scroll/compare/v2.3.1...master
98+
[2.3.1]: https://github.com/webcreate/infinite-ajax-scroll/compare/v2.3.0...v2.3.1
99+
[2.3.0]: https://github.com/webcreate/infinite-ajax-scroll/compare/v2.2.3...v2.3.0
100+
[2.2.3]: https://github.com/webcreate/infinite-ajax-scroll/compare/v2.2.2...v2.2.3
101+
[2.2.2]: https://github.com/webcreate/infinite-ajax-scroll/compare/v2.2.1...v2.2.2
102+
[2.2.1]: https://github.com/webcreate/infinite-ajax-scroll/compare/v2.2.0...v2.2.1
103+
[2.2.0]: https://github.com/webcreate/infinite-ajax-scroll/compare/v2.1.3...v2.2.0
104+
[2.1.3]: https://github.com/webcreate/infinite-ajax-scroll/compare/v2.1.2...v2.1.3
105+
[2.1.2]: https://github.com/webcreate/infinite-ajax-scroll/compare/v2.1.1...v2.1.2
106+
[2.1.1]: https://github.com/webcreate/infinite-ajax-scroll/compare/v2.1.0...v2.1.1
107+
[2.1.0]: https://github.com/webcreate/infinite-ajax-scroll/compare/v2.0.0...v2.1.0
108+
[2.0.0]: https://github.com/webcreate/infinite-ajax-scroll/compare/v1.1.0...v2.0.0

CONTRIBUTING.md

Lines changed: 0 additions & 42 deletions
This file was deleted.

Gruntfile.js

Lines changed: 0 additions & 65 deletions
This file was deleted.

LICENSE

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
This program is free software: you can redistribute it and/or modify
2+
it under the terms of the GNU Affero General Public License as
3+
published by the Free Software Foundation, either version 3 of the
4+
License.
5+
6+
This program is distributed in the hope that it will be useful,
7+
but WITHOUT ANY WARRANTY; without even the implied warranty of
8+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9+
GNU Affero General Public License for more details.
10+
11+
You should have received a copy of the GNU Affero General Public License
12+
along with this program. If not, see <https://www.gnu.org/licenses/>.
13+
14+
You can be released from the requirements of the license by purchasing
15+
an Infinite Ajax Scroll Commercial License. Buying such a license is
16+
mandatory as soon as you develop commercial activities involving the
17+
Infinite Ajax Scroll software without disclosing the source code of
18+
your own applications. See <https://infiniteajaxscroll.com/licenses/>
19+
for more details.

0 commit comments

Comments
 (0)