Merge branch 'hotfix'
This commit is contained in:
commit
2855656a2d
@ -7,6 +7,7 @@
|
||||
- Support selecting options with blank or `0` option values [https://github.com/select2/select2/commit/16b4840c0e2df0461998e3b464ee0a546173950d, https://github.com/select2/select2/commit/0358ee528765157234643d289bce6b8ca5889c72]
|
||||
|
||||
### Bug fixes
|
||||
- Fix issue with entire form losing focus when tabbing away from a Select2 control (#4419)
|
||||
- Fix UMD support for CommonJS [https://github.com/select2/select2/commit/45a877345482956021161203ac789c25f40a7d5e]
|
||||
|
||||
### Documentation
|
||||
|
@ -351,7 +351,7 @@ module.exports = function (grunt) {
|
||||
|
||||
var ciTasks = [];
|
||||
|
||||
ciTasks.push('compile')
|
||||
ciTasks.push('compile');
|
||||
ciTasks.push('connect:tests');
|
||||
|
||||
// Can't run Sauce Labs tests in pull requests
|
||||
|
@ -1,6 +1,6 @@
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2012-2015 Kevin Brown, Igor Vaynberg, and Select2 contributors
|
||||
Copyright (c) 2012-2017 Kevin Brown, Igor Vaynberg, and Select2 contributors
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
@ -38,7 +38,7 @@
|
||||
"src",
|
||||
"dist"
|
||||
],
|
||||
"version": "4.0.3",
|
||||
"version": "4.0.4",
|
||||
"jspm": {
|
||||
"main": "js/select2",
|
||||
"directories": {
|
||||
@ -61,7 +61,10 @@
|
||||
"grunt-gh-pages": "^0.9.1",
|
||||
"grunt-jekyll": "^0.4.2",
|
||||
"grunt-sass": "^1.0.0",
|
||||
"grunt-saucelabs": "^9.0.0"
|
||||
"grunt-saucelabs": "^9.0.0",
|
||||
"node-sass": "^4.5.3",
|
||||
"request": "<=2.81.0",
|
||||
"shrinkwrap": "^0.4.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"almond": "~0.3.1",
|
||||
|
@ -11,7 +11,7 @@
|
||||
"tag",
|
||||
"tagging"
|
||||
],
|
||||
"version": "4.0.3",
|
||||
"version": "4.0.4",
|
||||
"author": {
|
||||
"name": "Kevin Brown",
|
||||
"url": "https://github.com/kevin-brown"
|
||||
|
2
src/js/select2/dropdown/search.js
vendored
2
src/js/select2/dropdown/search.js
vendored
@ -63,7 +63,7 @@ define([
|
||||
});
|
||||
|
||||
container.on('focus', function () {
|
||||
if (container.isOpen()) {
|
||||
if (!container.isOpen()) {
|
||||
self.$search.focus();
|
||||
}
|
||||
});
|
||||
|
Loading…
Reference in New Issue
Block a user