From 294e7e664d95eafb7f41264c2b87412ad9aa48fc Mon Sep 17 00:00:00 2001 From: Nino Schoch Date: Thu, 16 Jun 2016 13:45:21 +0200 Subject: [PATCH 1/4] Fixed form focus lost --- src/js/select2/dropdown/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/select2/dropdown/search.js b/src/js/select2/dropdown/search.js index 3e9df401..cee81feb 100644 --- a/src/js/select2/dropdown/search.js +++ b/src/js/select2/dropdown/search.js @@ -63,7 +63,7 @@ define([ }); container.on('focus', function () { - if (container.isOpen()) { + if (!container.isOpen()) { self.$search.focus(); } }); From 06d2293f3e491690f9b5fbf1004d907bc54b3531 Mon Sep 17 00:00:00 2001 From: alexweissman Date: Wed, 6 Sep 2017 17:03:04 -0400 Subject: [PATCH 2/4] add changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..ff7c8c48 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,4 @@ +# Change Log + +## 4.0.4 +- Fix issue with entire form losing focus when tabbing away from a Select2 control (#4419) From 2eadef964f6fc1df66b279f3f2167756e3bbd2b6 Mon Sep 17 00:00:00 2001 From: alexweissman Date: Wed, 6 Sep 2017 17:05:28 -0400 Subject: [PATCH 3/4] update version in package manager config files --- LICENSE.md | 2 +- component.json | 2 +- package.json | 2 +- select2.jquery.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 86c7c291..8cb8a2b1 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -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 diff --git a/component.json b/component.json index cacb935a..1fb29fd7 100644 --- a/component.json +++ b/component.json @@ -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.3", + "version": "4.0.4", "demo": "https://select2.github.io/", "keywords": [ "jquery" diff --git a/package.json b/package.json index d962f13a..6b727f8a 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "src", "dist" ], - "version": "4.0.3", + "version": "4.0.4", "jspm": { "main": "js/select2", "directories": { diff --git a/select2.jquery.json b/select2.jquery.json index e2df6ef1..3638577a 100644 --- a/select2.jquery.json +++ b/select2.jquery.json @@ -11,7 +11,7 @@ "tag", "tagging" ], - "version": "4.0.3", + "version": "4.0.4", "author": { "name": "Kevin Brown", "url": "https://github.com/kevin-brown" From 41edff388bc45d7b50b6a572e73769a45eb31605 Mon Sep 17 00:00:00 2001 From: alexweissman Date: Sun, 24 Sep 2017 11:48:36 -0400 Subject: [PATCH 4/4] lock version of node-sass and request to deal with Travis build issues See https://github.com/sass/node-sass/issues/2100 --- package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 6b727f8a..f4de4249 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,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",