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

mark elements as selected when closeOnSelect is false so they cannot be selected again. fixes #229

Browse Source
This commit is contained in:
Igor Vaynberg 2012-07-18 10:26:49 +03:00
parent ad9fac45ae
commit 633a6dc901
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
select2.js
View File

@ -909,7 +909,7 @@
// abstract // abstract
highlight: function (index) { highlight: function (index) {
var choices = this.results.find(".select2-result-selectable"); var choices = this.results.find(".select2-result-selectable").not(".select2-disabled");
if (arguments.length === 0) { if (arguments.length === 0) {
return indexOf(choices.filter(".select2-highlighted")[0], choices.get()); return indexOf(choices.filter(".select2-highlighted")[0], choices.get());
@ -923,7 +923,11 @@
$(choices[index]).addClass("select2-highlighted"); $(choices[index]).addClass("select2-highlighted");
this.ensureHighlightVisible(); this.ensureHighlightVisible();
//if (this.opened()) this.focusSearch(); },
// abstract
countSelectableResults: function() {
return this.results.find(".select2-result-selectable").not(".select2-disabled").length;
}, },
// abstract // abstract
@ -1079,8 +1083,12 @@
// abstract // abstract
selectHighlighted: function () { selectHighlighted: function () {
var data = this.results.find(".select2-highlighted").not(".select2-disabled").closest('.select2-result-selectable').data("select2-data"); var index=this.highlight(),
highlighted=this.results.find(".select2-highlighted").not(".select2-disabled"),
data = highlighted.closest('.select2-result-selectable').data("select2-data");
if (data) { if (data) {
highlighted.addClass("select2-disabled");
this.highlight(index);
this.onSelect(data); this.onSelect(data);
} }
}, },
@ -1468,10 +1476,6 @@
prepareOpts: function () { prepareOpts: function () {
var opts = this.parent.prepareOpts.apply(this, arguments); var opts = this.parent.prepareOpts.apply(this, arguments);
opts = $.extend({}, {
closeOnSelect: true
}, opts);
// TODO validate placeholder is a string if specified // TODO validate placeholder is a string if specified
if (opts.element.get(0).tagName.toLowerCase() === "select") { if (opts.element.get(0).tagName.toLowerCase() === "select") {
@ -1696,6 +1700,13 @@
} else { } else {
this.search.width(10); this.search.width(10);
this.resizeSearch(); this.resizeSearch();
if (this.countSelectableResults()>0) {
this.positionDropdown();
} else {
// if nothing left to select close
this.close();
}
} }
// since its not possible to select an element that has already been // since its not possible to select an element that has already been
@ -1975,6 +1986,7 @@
// plugin defaults, accessible to users // plugin defaults, accessible to users
$.fn.select2.defaults = { $.fn.select2.defaults = {
closeOnSelect:true,
containerCss: {}, containerCss: {},
dropdownCss: {}, dropdownCss: {},
containerCssClass: "", containerCssClass: "",