RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2025-02-19 21:43:15 +03:00
Code Issues Projects Releases Wiki Activity

allow opts.dropdownCss to override css even after position. fixes #328

Browse Source
This commit is contained in:
Igor Vaynberg 2012-08-16 22:54:14 -07:00
parent 7b60524b35
commit afd353788b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
select2.js
View File

@ -359,7 +359,7 @@
query.callback({results: data}); query.callback({results: data});
return; return;
} }
process = function(datum, collection) { process = function(datum, collection) {
var group; var group;
datum = datum[0]; datum = datum[0];
@ -375,7 +375,7 @@
} }
} }
}; };
$(data).each2(function(i, datum) { process(datum, filtered.results); }); $(data).each2(function(i, datum) { process(datum, filtered.results); });
query.callback(filtered); query.callback(filtered);
}; };
@ -967,8 +967,6 @@
if (this.search.val() === " ") { this.search.val(""); } if (this.search.val() === " ") { this.search.val(""); }
this.dropdown.css(evaluate(this.opts.dropdownCss));
this.dropdown.addClass("select2-drop-active");
this.container.addClass("select2-dropdown-open").addClass("select2-container-active"); this.container.addClass("select2-dropdown-open").addClass("select2-container-active");
this.updateResults(true); this.updateResults(true);
@ -978,9 +976,12 @@
} }
this.dropdown.show(); this.dropdown.show();
this.ensureHighlightVisible();
this.positionDropdown(); this.positionDropdown();
this.dropdown.css(evaluate(this.opts.dropdownCss));
this.dropdown.addClass("select2-drop-active");
this.ensureHighlightVisible();
this.focusSearch(); this.focusSearch();
}, },