Skip to content

Commit 5dcc102

Browse files
authored
Merge pull request select2#5488 from select2/develop
Release Select2 4.0.6
2 parents a9c1b61 + 3e9809d commit 5dcc102

168 files changed

Lines changed: 11626 additions & 9661 deletions

Some content is hidden

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

.github/stale.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Number of days of inactivity before an issue becomes stale
2+
daysUntilStale: 60
3+
# Number of days of inactivity before a stale issue is closed
4+
daysUntilClose: 7
5+
# Issues with these labels will never be considered stale
6+
# Label to use when marking an issue as stale
7+
staleLabel: "status: stale"
8+
# Comment to post when marking an issue as stale. Set to `false` to disable
9+
markComment: >
10+
This issue has been automatically marked as stale because it has not had
11+
recent activity. It will be closed if no further activity occurs. Thank you
12+
for your contributions.
13+
# Comment to post when closing a stale issue. Set to `false` to disable
14+
closeComment: false

CHANGELOG.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,43 @@
11
# Change Log
22

3+
## 4.0.6
4+
5+
### New features/improvements
6+
- Add style property to package.json (#5019)
7+
- Implement `clear` and `clearing` events (#5058)
8+
- Add `scrollAfterSelect` option (#5150)
9+
- Add missing diacritics (#4118, #4337, #5464)
10+
11+
### Bug fixes
12+
- Fix up arrow error when there are no options in dropdown (#5127)
13+
- Add `;` before beginning of factory wrapper (#5089)
14+
- Fix IE11 issue with select losing focus after selecting an item (#4860)
15+
- Clear tooltip from `select2-selection__rendered` when selection is cleared (#4640, #4746)
16+
- Fix keyboard not closing when closing dropdown on iOS 10 (#4680)
17+
- User-defined types not normalized properly when passed in as data (#4632)
18+
- Perform deep merge for `Defaults.set()` (#4364)
19+
- Fix "the results could not be loaded" displaying during AJAX request (#4356)
20+
- Cache objects in `Utils.__cache` instead of using `$.data` (#4346, #5486)
21+
- Removing the double event binding registration of `selection:update` (#4306)
22+
23+
#### Accessibility
24+
- Improve `.select2-hidden-accessible` (#4908)
25+
- Add role and aria-readonly attributes to single selection dropdown value (#4881)
26+
27+
### Translations
28+
- Add Turkmen translations (`tk`) (#5125)
29+
- Fix error in French translations (#5122)
30+
- Add Albanian translation (`sq`) (#5199)
31+
- Add Georgian translation (`ka`) (#5179)
32+
- Add Nepali translation (`ne`) (#5295)
33+
- Add Bangla translation (`bn`) (#5248)
34+
- Add `removeAllItems` translation for clear "x" title (#5291)
35+
- Fix wording in Vietnamese translations (#5387)
36+
- Fix error in Russian translation (#5401)
37+
38+
### Miscellaneous
39+
- Remove duplicate CSS selector in classic theme (#5115)
40+
341
## 4.0.5
442

543
### Bug fixes

Gruntfile.js

Lines changed: 3 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ module.exports = function (grunt) {
6262
grunt.initConfig({
6363
package: grunt.file.readJSON('package.json'),
6464

65-
clean: {
66-
docs: ['docs/_site']
67-
},
68-
6965
concat: {
7066
'dist': {
7167
options: {
@@ -124,88 +120,10 @@ module.exports = function (grunt) {
124120
}
125121
},
126122

127-
'saucelabs-qunit': {
128-
all: {
129-
options: {
130-
build: testBuildNumber,
131-
tags: ['tests', 'qunit'],
132-
urls: testUrls,
133-
testTimeout: 8000,
134-
testname: 'QUnit test for Select2',
135-
browsers: [
136-
{
137-
browserName: 'internet explorer',
138-
version: '8',
139-
platform: 'Windows 7'
140-
},
141-
{
142-
browserName: 'internet explorer',
143-
version: '9',
144-
platform: 'Windows 7'
145-
},
146-
{
147-
browserName: 'internet explorer',
148-
version: '10',
149-
platform: 'Windows 7'
150-
},
151-
152-
{
153-
browserName: 'internet explorer',
154-
version: '11',
155-
platform: 'Windows 10'
156-
},
157-
158-
{
159-
browserName: 'firefox',
160-
platform: 'linux'
161-
},
162-
163-
{
164-
browserName: 'chrome',
165-
platform: 'linux'
166-
},
167-
168-
{
169-
browserName: 'opera',
170-
version: '12',
171-
platform: 'linux'
172-
}
173-
]
174-
}
175-
}
176-
},
177-
178-
'gh-pages': {
179-
options: {
180-
base: 'docs',
181-
branch: 'master',
182-
clone: 'node_modules/grunt-gh-pages/repo',
183-
message: 'Updated docs with master',
184-
push: true,
185-
repo: 'git@github.com:select2/select2.github.io.git'
186-
},
187-
src: '**'
188-
},
189-
190-
jekyll: {
191-
options: {
192-
src: 'docs',
193-
dest: 'docs/_site'
194-
},
195-
build: {
196-
d: null
197-
},
198-
serve: {
199-
options: {
200-
serve: true,
201-
watch: true
202-
}
203-
}
204-
},
205-
206123
jshint: {
207124
options: {
208-
jshintrc: true
125+
jshintrc: true,
126+
reporterOutput: ''
209127
},
210128
code: {
211129
src: ['src/js/**/*.js']
@@ -240,19 +158,6 @@ module.exports = function (grunt) {
240158
}
241159
},
242160

243-
symlink: {
244-
docs: {
245-
cwd: 'dist',
246-
expand: true,
247-
overwrite: false,
248-
src: [
249-
'*'
250-
],
251-
dest: 'docs/dist',
252-
filter: 'isDirectory'
253-
}
254-
},
255-
256161
requirejs: {
257162
'dist': {
258163
options: {
@@ -331,19 +236,14 @@ module.exports = function (grunt) {
331236
}
332237
});
333238

334-
grunt.loadNpmTasks('grunt-contrib-clean');
335239
grunt.loadNpmTasks('grunt-contrib-concat');
336240
grunt.loadNpmTasks('grunt-contrib-connect');
337241
grunt.loadNpmTasks('grunt-contrib-jshint');
338242
grunt.loadNpmTasks('grunt-contrib-qunit');
339243
grunt.loadNpmTasks('grunt-contrib-requirejs');
340-
grunt.loadNpmTasks('grunt-contrib-symlink');
341244
grunt.loadNpmTasks('grunt-contrib-uglify');
342245
grunt.loadNpmTasks('grunt-contrib-watch');
343246

344-
grunt.loadNpmTasks('grunt-gh-pages');
345-
grunt.loadNpmTasks('grunt-jekyll');
346-
grunt.loadNpmTasks('grunt-saucelabs');
347247
grunt.loadNpmTasks('grunt-sass');
348248

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

359-
var ciTasks = [];
360-
361-
ciTasks.push('compile');
362-
ciTasks.push('connect:tests');
363-
364-
/*
365-
// grunt-saucelabs appears to be broken with Travis altogether now.
366-
// Can't run Sauce Labs tests in pull requests
367-
if (process.env.TRAVIS_PULL_REQUEST == 'false') {
368-
ciTasks.push('saucelabs-qunit');
369-
}
370-
*/
371-
372-
ciTasks.push('qunit');
373-
ciTasks.push('jshint');
374-
375-
grunt.registerTask('ci', ciTasks);
376-
377-
grunt.registerTask('docs', ['symlink:docs', 'jekyll:serve']);
378-
379-
grunt.registerTask('docs-release', ['default', 'clean:docs', 'gh-pages']);
259+
grunt.registerTask('ci', ['compile', 'test']);
380260
};

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
Select2
22
=======
33
[![Build Status][travis-ci-image]][travis-ci-status]
4+
[![cdnjs](https://img.shields.io/cdnjs/v/select2.svg)](https://cdnjs.com/libraries/select2)
5+
[![jsdelivr](https://data.jsdelivr.com/v1/package/npm/select2/badge)](https://www.jsdelivr.com/package/npm/select2)
46

57
Select2 is a jQuery-based replacement for select boxes. It supports searching,
68
remote data sets, and pagination of results.
@@ -51,10 +53,12 @@ Plugins
5153
- [django-autocomplete-light]
5254
- [django-easy-select2]
5355
- [django-select2]
56+
* [Drupal] - [drupal-select2]
5457
* [Meteor] - [meteor-select2]
5558
* [Ruby on Rails][ruby-on-rails] - [select2-rails]
5659
* [Wicket] - [wicketstuff-select2]
5760
* [Yii 2][yii2] - [yii2-widget-select2]
61+
* [Angularjs][angularjs] - [mdr-angular-select2]
5862

5963
Themes
6064

@@ -106,6 +110,8 @@ The license is available within the repository in the [LICENSE][license] file.
106110
[django-autocomplete-light]: https://github.com/yourlabs/django-autocomplete-light
107111
[django-easy-select2]: https://github.com/asyncee/django-easy-select2
108112
[django-select2]: https://github.com/applegrew/django-select2
113+
[drupal]: https://www.drupal.org/
114+
[drupal-select2]: https://www.drupal.org/project/select2
109115
[flat-ui]: http://designmodo.github.io/Flat-UI/
110116
[meteor]: https://www.meteor.com/
111117
[meteor-select2]: https://github.com/nate-strauser/meteor-select2
@@ -121,3 +127,5 @@ The license is available within the repository in the [LICENSE][license] file.
121127
[wicketstuff-select2]: https://github.com/wicketstuff/core/tree/master/select2-parent
122128
[yii2]: http://www.yiiframework.com/
123129
[yii2-widget-select2]: https://github.com/kartik-v/yii2-widget-select2
130+
[angularjs]: https://angularjs.org/
131+
[mdr-angular-select2]: https://github.com/modulr/mdr-angular-select2

component.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "select2",
33
"repo": "select/select2",
44
"description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.",
5-
"version": "4.0.5",
5+
"version": "4.0.6",
66
"demo": "https://select2.org/",
77
"keywords": [
88
"jquery"

dist/css/select2.css

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,14 @@
118118
.select2-hidden-accessible {
119119
border: 0 !important;
120120
clip: rect(0 0 0 0) !important;
121+
-webkit-clip-path: inset(50%) !important;
122+
clip-path: inset(50%) !important;
121123
height: 1px !important;
122-
margin: -1px !important;
123124
overflow: hidden !important;
124125
padding: 0 !important;
125126
position: absolute !important;
126-
width: 1px !important; }
127+
width: 1px !important;
128+
white-space: nowrap !important; }
127129

128130
.select2-container--default .select2-selection--single {
129131
background-color: #fff;
@@ -420,9 +422,7 @@
420422
color: #555; }
421423

422424
.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
423-
float: right; }
424-
425-
.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
425+
float: right;
426426
margin-left: 5px;
427427
margin-right: auto; }
428428

0 commit comments

Comments
 (0)