RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2024-11-28 15:46:03 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'hotfix'

Browse Source
This commit is contained in:
alexweissman 2017-09-24 12:03:26 -04:00
commit 2855656a2d
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -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] - 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 ### 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] - Fix UMD support for CommonJS [https://github.com/select2/select2/commit/45a877345482956021161203ac789c25f40a7d5e]
### Documentation ### Documentation

2
Gruntfile.js
View File

@ -351,7 +351,7 @@ module.exports = function (grunt) {
var ciTasks = []; var ciTasks = [];
ciTasks.push('compile') ciTasks.push('compile');
ciTasks.push('connect:tests'); ciTasks.push('connect:tests');
// Can't run Sauce Labs tests in pull requests // Can't run Sauce Labs tests in pull requests

2
LICENSE.md
View File

@ -1,6 +1,6 @@
The MIT License (MIT) 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 Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

7
package.json
View File

@ -38,7 +38,7 @@
"src", "src",
"dist" "dist"
], ],
"version": "4.0.3", "version": "4.0.4",
"jspm": { "jspm": {
"main": "js/select2", "main": "js/select2",
"directories": { "directories": {
@ -61,7 +61,10 @@
"grunt-gh-pages": "^0.9.1", "grunt-gh-pages": "^0.9.1",
"grunt-jekyll": "^0.4.2", "grunt-jekyll": "^0.4.2",
"grunt-sass": "^1.0.0", "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": { "dependencies": {
"almond": "~0.3.1", "almond": "~0.3.1",

2
select2.jquery.json
View File

@ -11,7 +11,7 @@
"tag", "tag",
"tagging" "tagging"
], ],
"version": "4.0.3", "version": "4.0.4",
"author": { "author": {
"name": "Kevin Brown", "name": "Kevin Brown",
"url": "https://github.com/kevin-brown" "url": "https://github.com/kevin-brown"

2
src/js/select2/dropdown/search.js vendored
View File

@ -63,7 +63,7 @@ define([
}); });
container.on('focus', function () { container.on('focus', function () {
if (container.isOpen()) { if (!container.isOpen()) {
self.$search.focus(); self.$search.focus();
} }
}); });