Skip to content

Commit 2855656

Browse files
committed
Merge branch 'hotfix'
2 parents a4ec7fa + 41edff3 commit 2855656

6 files changed

Lines changed: 10 additions & 6 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
- Support selecting options with blank or `0` option values [https://github.com/select2/select2/commit/16b4840c0e2df0461998e3b464ee0a546173950d, https://github.com/select2/select2/commit/0358ee528765157234643d289bce6b8ca5889c72]
88

99
### Bug fixes
10+
- Fix issue with entire form losing focus when tabbing away from a Select2 control (#4419)
1011
- Fix UMD support for CommonJS [https://github.com/select2/select2/commit/45a877345482956021161203ac789c25f40a7d5e]
1112

1213
### Documentation

Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ module.exports = function (grunt) {
351351

352352
var ciTasks = [];
353353

354-
ciTasks.push('compile')
354+
ciTasks.push('compile');
355355
ciTasks.push('connect:tests');
356356

357357
// Can't run Sauce Labs tests in pull requests

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2012-2015 Kevin Brown, Igor Vaynberg, and Select2 contributors
3+
Copyright (c) 2012-2017 Kevin Brown, Igor Vaynberg, and Select2 contributors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"src",
3939
"dist"
4040
],
41-
"version": "4.0.3",
41+
"version": "4.0.4",
4242
"jspm": {
4343
"main": "js/select2",
4444
"directories": {
@@ -61,7 +61,10 @@
6161
"grunt-gh-pages": "^0.9.1",
6262
"grunt-jekyll": "^0.4.2",
6363
"grunt-sass": "^1.0.0",
64-
"grunt-saucelabs": "^9.0.0"
64+
"grunt-saucelabs": "^9.0.0",
65+
"node-sass": "^4.5.3",
66+
"request": "<=2.81.0",
67+
"shrinkwrap": "^0.4.0"
6568
},
6669
"dependencies": {
6770
"almond": "~0.3.1",

select2.jquery.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"tag",
1212
"tagging"
1313
],
14-
"version": "4.0.3",
14+
"version": "4.0.4",
1515
"author": {
1616
"name": "Kevin Brown",
1717
"url": "https://github.com/kevin-brown"

src/js/select2/dropdown/search.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ define([
6363
});
6464

6565
container.on('focus', function () {
66-
if (container.isOpen()) {
66+
if (!container.isOpen()) {
6767
self.$search.focus();
6868
}
6969
});

0 commit comments

Comments
 (0)