Skip to content

Commit

Permalink
infinite scrolling
Browse files Browse the repository at this point in the history
  • Loading branch information
cubiq committed Jan 8, 2014
1 parent 4e70e4e commit c4e1321
Show file tree
Hide file tree
Showing 24 changed files with 2,760 additions and 66 deletions.
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# Contributing to iScroll / FAQ

## Why is my patch not accepted?
Thank you very much for your contribution. Please make sure you signed the CLA (see below). Also, we have to test every change on countless devices before we can add it to the project. Often one fix for one device breaks a lof of stuff for others. Unlike other open-source projects, we don't have the luxury of being able to unit test changes. A lot of manual testing is involved. Please be patient with us.

If you want to speed up the process, please provide your own test results and try to be as specific as possible.

## Why we need a CLA (Contributor License Agreement)

All contributions are welcome but to enforce the openess of this script I have to ask all contributors to sign a Contributor License Agreement. I'm sorry about this but it's the only way to keep the script free and Open Source.
All contributions are welcome but to enforce the openness of this script I have to ask all contributors to sign a Contributor License Agreement. I'm sorry about this but it's the only way to keep the script free and Open Source.

If you are an individual, please sign the following form:
http://cubiq.org/iscroll/cla/individual.html

If you are a company or an entity please sign the following form:
http://cubiq.org/iscroll/cla/entity.html

## Why is my patch not accepted yet?
Thank you very much for your contribution. Please make sure you signed the CLA (see above). Please note that pull requests may take some time to be accepted. Testing iScroll is one of the most time consuming tasks of the project. iScroll works from desktop to smartphone, from tablets to smart TVs. I do not have physical access to all the testing devices, so before I can push a change I have to make sure that the new code is working everywhere.

If you want to speed up the process, please provide your own test results and try to be as more specific as possible.

Thanks!
Matteo Spinelli
776 changes: 769 additions & 7 deletions README.md

Large diffs are not rendered by default.

19 changes: 17 additions & 2 deletions build.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ var banner = '/*! iScroll v' + pkg.version + ' ~ (c) 2008-' + (new Date().getFul

var releases = {
lite: {
files: ['default/_animate.js', 'default/handleEvent.js']
files: [
'default/_animate.js',
'default/handleEvent.js'
]
},

iscroll: {
Expand Down Expand Up @@ -50,6 +53,18 @@ var releases = {
'indicator/indicator.js'
],
postProcessing: [ 'zoom/build.json', 'indicator/build.json', 'wheel/build.json', 'snap/build.json', 'keys/build.json' ]
},

infinite: {
files: [
'wheel/wheel.js',
'snap/snap.js',
'keys/keys.js',
'probe/_animate.js',
'infinite/infinite.js',
'default/handleEvent.js',
],
postProcessing: [ 'wheel/build.json', 'snap/build.json', 'keys/build.json', 'infinite/build.json', 'probe/build.json' ]
}
};

Expand All @@ -60,7 +75,7 @@ if ( !args.length ) {
}

if ( args[0] == 'dist' ) {
args = ['lite', 'iscroll', 'zoom', 'probe'];
args = ['lite', 'iscroll', 'zoom', 'probe', 'infinite'];
}

// Get the list of files
Expand Down
Loading

0 comments on commit c4e1321

Please sign in to comment.