From ed24a51ea3fcf5ede481d7d1d7eae852f70928ad Mon Sep 17 00:00:00 2001 From: Kevin Brown Date: Fri, 2 Jan 2015 21:08:19 -0500 Subject: [PATCH] Updated docs to use the Select2 GitHub organization Documentation will now be at https://select2.github.io --- Gruntfile.js | 5 +++-- dist/js/select2.amd.full.js | 2 ++ dist/js/select2.amd.js | 2 ++ dist/js/select2.full.js | 2 ++ dist/js/select2.js | 2 ++ docs/README.md | 15 +++++++++++++++ 6 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 docs/README.md diff --git a/Gruntfile.js b/Gruntfile.js index 86e2218f..f0740cc9 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -60,10 +60,11 @@ module.exports = function (grunt) { 'gh-pages': { options: { base: 'docs', + branch: 'master', clone: 'node_modules/grunt-gh-pages/repo', message: 'Updated docs with master', push: true, - repo: 'git@github.com:kevin-brown/select2.git' + repo: 'git@github.com:select2/select2.github.io.git' }, src: '**' }, @@ -233,5 +234,5 @@ module.exports = function (grunt) { grunt.registerTask('docs', ['jekyll:serve']); - grunt.registerTask('release', ['default', 'clean:docs', 'gh-pages']); + grunt.registerTask('docs-release', ['default', 'clean:docs', 'gh-pages']); }; diff --git a/dist/js/select2.amd.full.js b/dist/js/select2.amd.full.js index 7b1cf71d..460c9942 100644 --- a/dist/js/select2.amd.full.js +++ b/dist/js/select2.amd.full.js @@ -546,12 +546,14 @@ define('select2/results',[ if (isAtTop) { self.$results.scrollTop(0); + e.preventDefault(); e.stopPropagation(); } else if (isAtBottom) { self.$results.scrollTop( self.$results.get(0).scrollHeight - self.$results.height() ); + e.preventDefault(); e.stopPropagation(); } diff --git a/dist/js/select2.amd.js b/dist/js/select2.amd.js index cbb8e867..8c67b0d0 100644 --- a/dist/js/select2.amd.js +++ b/dist/js/select2.amd.js @@ -546,12 +546,14 @@ define('select2/results',[ if (isAtTop) { self.$results.scrollTop(0); + e.preventDefault(); e.stopPropagation(); } else if (isAtBottom) { self.$results.scrollTop( self.$results.get(0).scrollHeight - self.$results.height() ); + e.preventDefault(); e.stopPropagation(); } diff --git a/dist/js/select2.full.js b/dist/js/select2.full.js index 98b69754..c483dd46 100644 --- a/dist/js/select2.full.js +++ b/dist/js/select2.full.js @@ -10081,12 +10081,14 @@ define('select2/results',[ if (isAtTop) { self.$results.scrollTop(0); + e.preventDefault(); e.stopPropagation(); } else if (isAtBottom) { self.$results.scrollTop( self.$results.get(0).scrollHeight - self.$results.height() ); + e.preventDefault(); e.stopPropagation(); } diff --git a/dist/js/select2.js b/dist/js/select2.js index 417489b8..6349a9be 100644 --- a/dist/js/select2.js +++ b/dist/js/select2.js @@ -974,12 +974,14 @@ define('select2/results',[ if (isAtTop) { self.$results.scrollTop(0); + e.preventDefault(); e.stopPropagation(); } else if (isAtBottom) { self.$results.scrollTop( self.$results.get(0).scrollHeight - self.$results.height() ); + e.preventDefault(); e.stopPropagation(); } diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 00000000..5d0f2e6a --- /dev/null +++ b/docs/README.md @@ -0,0 +1,15 @@ +Select2 Documentation +===================== +This repository holds the latest documentation for [Select2][select2]. + +The documentation is automatically extracted from the `docs` directory at the +[Select2 source repository][select2-source]. This is done periodically by +the maintainers of Select2. + +**Pull requests will usually be ignored, documentation fixes should be made in +the source repository.** We _may_ accept pull requests if they match the +source `docs` directory, but for the most part pull requests will be closed on +sight. + +[select2]: https://select2.github.io +[select2-source]: https://github.com/select2/select2