aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web/src/main/js/libs/third-party
diff options
context:
space:
mode:
authorJenkins CI <ci@sonarsource.com>2015-10-21 08:01:17 +0200
committerJenkins CI <ci@sonarsource.com>2015-10-21 08:01:17 +0200
commitdf2b95020a82ed588d35526ff915ac2187c325da (patch)
tree965cf32dc362e2b205fd6cf7996646c332b27fa2 /server/sonar-web/src/main/js/libs/third-party
parent187f501d31cba9ff220c44bbcd222768a4eee40e (diff)
parent5945ad454bcbac6bd7f1f6c9651daabeffe02f4f (diff)
downloadsonarqube-df2b95020a82ed588d35526ff915ac2187c325da.tar.gz
sonarqube-df2b95020a82ed588d35526ff915ac2187c325da.zip
Automatic merge from branch-5.2
* origin/branch-5.2: [maven-release-plugin] prepare for next development iteration [maven-release-plugin] prepare release 5.2-RC3 Hack for IE - use mime type text/plain for api/qualityprofiles/create fix quality profile deletion dialog on ie9 Fix some quality flaw SONAR-6822 Rules search WS is not returning langName SONAR-6822 Move search action tests to a dedicated test class SONAR-6680 RuleRepository now load all rules at first call SONAR-6680 add RuleDao.selectAll to be used by CE's RuleRepository Fix quality flaws fix select2 closing problem in the facet sidebar
Diffstat (limited to 'server/sonar-web/src/main/js/libs/third-party')
-rw-r--r--server/sonar-web/src/main/js/libs/third-party/select2.js19
1 files changed, 11 insertions, 8 deletions
diff --git a/server/sonar-web/src/main/js/libs/third-party/select2.js b/server/sonar-web/src/main/js/libs/third-party/select2.js
index 213f4cf930a..8975c0ea4c2 100644
--- a/server/sonar-web/src/main/js/libs/third-party/select2.js
+++ b/server/sonar-web/src/main/js/libs/third-party/select2.js
@@ -962,15 +962,17 @@
var cid = this.containerId, selector = this.containerSelector,
scroll = "scroll." + cid, resize = "resize." + cid;
- this.container.parents().each(function() {
- $(this).bind(scroll, function() {
- var s2 = $(selector);
- if (s2.length == 0) {
- $(this).unbind(scroll);
- }
- s2.select2("close");
+ setTimeout(function () {
+ this.container.parents().each(function() {
+ $(this).bind(scroll, function() {
+ var s2 = $(selector);
+ if (s2.length == 0) {
+ $(this).unbind(scroll);
+ }
+ s2.select2("close");
+ });
});
- });
+ }.bind(this), 100);
$(window).bind(resize, function() {
var s2 = $(selector);
@@ -1401,6 +1403,7 @@
// single
close: function () {
if (!this.opened()) return;
+ console.log('closing...');
this.parent.close.apply(this, arguments);
this.dropdown.removeAttr("style").addClass("select2-offscreen").insertAfter(this.selection).show();
},