Skip to content

Commit

Permalink
Merge pull request #5488 from select2/develop
Browse files Browse the repository at this point in the history
Release Select2 4.0.6
  • Loading branch information
kevin-brown committed Apr 28, 2019
2 parents a9c1b61 + 3e9809d commit 5dcc102
Show file tree
Hide file tree
Showing 168 changed files with 11,626 additions and 9,661 deletions.
14 changes: 14 additions & 0 deletions .github/stale.yml
@@ -0,0 +1,14 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 60
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 7
# Issues with these labels will never be considered stale
# Label to use when marking an issue as stale
staleLabel: "status: stale"
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false
38 changes: 38 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,43 @@
# Change Log

## 4.0.6

### New features/improvements
- Add style property to package.json (#5019)
- Implement `clear` and `clearing` events (#5058)
- Add `scrollAfterSelect` option (#5150)
- Add missing diacritics (#4118, #4337, #5464)

### Bug fixes
- Fix up arrow error when there are no options in dropdown (#5127)
- Add `;` before beginning of factory wrapper (#5089)
- Fix IE11 issue with select losing focus after selecting an item (#4860)
- Clear tooltip from `select2-selection__rendered` when selection is cleared (#4640, #4746)
- Fix keyboard not closing when closing dropdown on iOS 10 (#4680)
- User-defined types not normalized properly when passed in as data (#4632)
- Perform deep merge for `Defaults.set()` (#4364)
- Fix "the results could not be loaded" displaying during AJAX request (#4356)
- Cache objects in `Utils.__cache` instead of using `$.data` (#4346, #5486)
- Removing the double event binding registration of `selection:update` (#4306)

#### Accessibility
- Improve `.select2-hidden-accessible` (#4908)
- Add role and aria-readonly attributes to single selection dropdown value (#4881)

### Translations
- Add Turkmen translations (`tk`) (#5125)
- Fix error in French translations (#5122)
- Add Albanian translation (`sq`) (#5199)
- Add Georgian translation (`ka`) (#5179)
- Add Nepali translation (`ne`) (#5295)
- Add Bangla translation (`bn`) (#5248)
- Add `removeAllItems` translation for clear "x" title (#5291)
- Fix wording in Vietnamese translations (#5387)
- Fix error in Russian translation (#5401)

### Miscellaneous
- Remove duplicate CSS selector in classic theme (#5115)

## 4.0.5

### Bug fixes
Expand Down
126 changes: 3 additions & 123 deletions Gruntfile.js
Expand Up @@ -62,10 +62,6 @@ module.exports = function (grunt) {
grunt.initConfig({
package: grunt.file.readJSON('package.json'),

clean: {
docs: ['docs/_site']
},

concat: {
'dist': {
options: {
Expand Down Expand Up @@ -124,88 +120,10 @@ module.exports = function (grunt) {
}
},

'saucelabs-qunit': {
all: {
options: {
build: testBuildNumber,
tags: ['tests', 'qunit'],
urls: testUrls,
testTimeout: 8000,
testname: 'QUnit test for Select2',
browsers: [
{
browserName: 'internet explorer',
version: '8',
platform: 'Windows 7'
},
{
browserName: 'internet explorer',
version: '9',
platform: 'Windows 7'
},
{
browserName: 'internet explorer',
version: '10',
platform: 'Windows 7'
},

{
browserName: 'internet explorer',
version: '11',
platform: 'Windows 10'
},

{
browserName: 'firefox',
platform: 'linux'
},

{
browserName: 'chrome',
platform: 'linux'
},

{
browserName: 'opera',
version: '12',
platform: 'linux'
}
]
}
}
},

'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:select2/select2.github.io.git'
},
src: '**'
},

jekyll: {
options: {
src: 'docs',
dest: 'docs/_site'
},
build: {
d: null
},
serve: {
options: {
serve: true,
watch: true
}
}
},

jshint: {
options: {
jshintrc: true
jshintrc: true,
reporterOutput: ''
},
code: {
src: ['src/js/**/*.js']
Expand Down Expand Up @@ -240,19 +158,6 @@ module.exports = function (grunt) {
}
},

symlink: {
docs: {
cwd: 'dist',
expand: true,
overwrite: false,
src: [
'*'
],
dest: 'docs/dist',
filter: 'isDirectory'
}
},

requirejs: {
'dist': {
options: {
Expand Down Expand Up @@ -331,19 +236,14 @@ module.exports = function (grunt) {
}
});

grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-qunit');
grunt.loadNpmTasks('grunt-contrib-requirejs');
grunt.loadNpmTasks('grunt-contrib-symlink');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch');

grunt.loadNpmTasks('grunt-gh-pages');
grunt.loadNpmTasks('grunt-jekyll');
grunt.loadNpmTasks('grunt-saucelabs');
grunt.loadNpmTasks('grunt-sass');

grunt.registerTask('default', ['compile', 'test', 'minify']);
Expand All @@ -356,25 +256,5 @@ module.exports = function (grunt) {
grunt.registerTask('minify', ['uglify', 'sass:dist']);
grunt.registerTask('test', ['connect:tests', 'qunit', 'jshint']);

var ciTasks = [];

ciTasks.push('compile');
ciTasks.push('connect:tests');

/*
// grunt-saucelabs appears to be broken with Travis altogether now.
// Can't run Sauce Labs tests in pull requests
if (process.env.TRAVIS_PULL_REQUEST == 'false') {
ciTasks.push('saucelabs-qunit');
}
*/

ciTasks.push('qunit');
ciTasks.push('jshint');

grunt.registerTask('ci', ciTasks);

grunt.registerTask('docs', ['symlink:docs', 'jekyll:serve']);

grunt.registerTask('docs-release', ['default', 'clean:docs', 'gh-pages']);
grunt.registerTask('ci', ['compile', 'test']);
};
8 changes: 8 additions & 0 deletions README.md
@@ -1,6 +1,8 @@
Select2
=======
[![Build Status][travis-ci-image]][travis-ci-status]
[![cdnjs](https://img.shields.io/cdnjs/v/select2.svg)](https://cdnjs.com/libraries/select2)
[![jsdelivr](https://data.jsdelivr.com/v1/package/npm/select2/badge)](https://www.jsdelivr.com/package/npm/select2)

Select2 is a jQuery-based replacement for select boxes. It supports searching,
remote data sets, and pagination of results.
Expand Down Expand Up @@ -51,10 +53,12 @@ Plugins
- [django-autocomplete-light]
- [django-easy-select2]
- [django-select2]
* [Drupal] - [drupal-select2]
* [Meteor] - [meteor-select2]
* [Ruby on Rails][ruby-on-rails] - [select2-rails]
* [Wicket] - [wicketstuff-select2]
* [Yii 2][yii2] - [yii2-widget-select2]
* [Angularjs][angularjs] - [mdr-angular-select2]

Themes

Expand Down Expand Up @@ -106,6 +110,8 @@ The license is available within the repository in the [LICENSE][license] file.
[django-autocomplete-light]: https://github.com/yourlabs/django-autocomplete-light
[django-easy-select2]: https://github.com/asyncee/django-easy-select2
[django-select2]: https://github.com/applegrew/django-select2
[drupal]: https://www.drupal.org/
[drupal-select2]: https://www.drupal.org/project/select2
[flat-ui]: http://designmodo.github.io/Flat-UI/
[meteor]: https://www.meteor.com/
[meteor-select2]: https://github.com/nate-strauser/meteor-select2
Expand All @@ -121,3 +127,5 @@ The license is available within the repository in the [LICENSE][license] file.
[wicketstuff-select2]: https://github.com/wicketstuff/core/tree/master/select2-parent
[yii2]: http://www.yiiframework.com/
[yii2-widget-select2]: https://github.com/kartik-v/yii2-widget-select2
[angularjs]: https://angularjs.org/
[mdr-angular-select2]: https://github.com/modulr/mdr-angular-select2
2 changes: 1 addition & 1 deletion component.json
Expand Up @@ -2,7 +2,7 @@
"name": "select2",
"repo": "select/select2",
"description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.",
"version": "4.0.5",
"version": "4.0.6",
"demo": "https://select2.org/",
"keywords": [
"jquery"
Expand Down
10 changes: 5 additions & 5 deletions dist/css/select2.css
Expand Up @@ -118,12 +118,14 @@
.select2-hidden-accessible {
border: 0 !important;
clip: rect(0 0 0 0) !important;
-webkit-clip-path: inset(50%) !important;
clip-path: inset(50%) !important;
height: 1px !important;
margin: -1px !important;
overflow: hidden !important;
padding: 0 !important;
position: absolute !important;
width: 1px !important; }
width: 1px !important;
white-space: nowrap !important; }

.select2-container--default .select2-selection--single {
background-color: #fff;
Expand Down Expand Up @@ -420,9 +422,7 @@
color: #555; }

.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
float: right; }

.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
float: right;
margin-left: 5px;
margin-right: auto; }

Expand Down

0 comments on commit 5dcc102

Please sign in to comment.