1
0
mirror of synced 2024-11-26 06:46:04 +03:00

catch up to master

This commit is contained in:
Igor Vaynberg 2012-03-26 23:53:42 -07:00
parent 803da6fcdc
commit e71783235e
2 changed files with 27 additions and 2 deletions

View File

@ -335,16 +335,23 @@
.select2-container-multi .select2-choices .select2-search-choice-focus {
background: #d4d4d4;
}
.select2-search-choice-close {
display: block;
position: absolute;
left: 3px;
right: 3px;
top: 4px;
width: 12px;
height: 13px;
font-size: 1px;
background: url(select2.png) right top no-repeat;
}
.select2-container-multi .select2-search-choice-close {
left: 3px;
}
.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover {
background-position: right -11px;
}

View File

@ -65,6 +65,24 @@
}
};
function indexOf(value, array) {
var i = 0, l = array.length, v;
if (value.constructor === String) {
for (; i < l; i++) if (value.localeCompare(array[i]) === 0) return i;
} else {
for (; i < l; i++) {
v = array[i];
if (v.constructor === String) {
if (v.localeCompare(value) === 0) return i;
} else {
if (v === value) return i;
}
}
}
return -1;
}
function getSideBorderPadding(element) {
return element.outerWidth() - element.width();
}
@ -970,7 +988,7 @@
throw "Invalid argument: " + selected + ". Must be .select2-search-choice";
}
index = val.indexOf(selected.data("select2-data").id);
index = indexOf(selected.data("select2-data").id, val);
if (index >= 0) {
val.splice(index, 1);