RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2024-11-22 13:06:08 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3122 from cristi-badila/master

Browse Source 
Fixes issues with inputData module. When unselecting an item it would previously unselect all items
This commit is contained in:
Kevin Brown 2015-03-10 13:21:09 -04:00
commit b917754e55
6 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/js/select2.amd.full.js vendored
View File

@ -5115,14 +5115,14 @@ define('select2/compat/inputData',[
this.current(function (allData) {
var values = [];
for (var d = 0; d < allData; d++) {
for (var d = 0; d < allData.length; d++) {
var item = allData[d];
if (data.id == item.id) {
continue;
}
values.push(data.id);
values.push(item.id);
}
self.$element.val(values.join(self._valueSeparator));

4
dist/js/select2.full.js vendored
View File

@ -5554,14 +5554,14 @@ define('select2/compat/inputData',[
this.current(function (allData) {
var values = [];
for (var d = 0; d < allData; d++) {
for (var d = 0; d < allData.length; d++) {
var item = allData[d];
if (data.id == item.id) {
continue;
}
values.push(data.id);
values.push(item.id);
}
self.$element.val(values.join(self._valueSeparator));

2
dist/js/select2.full.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/select2.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
src/js/select2/compat/inputData.js vendored
View File

@ -82,14 +82,14 @@ define([
this.current(function (allData) {
var values = [];
for (var d = 0; d < allData; d++) {
for (var d = 0; d < allData.length; d++) {
var item = allData[d];
if (data.id == item.id) {
continue;
}
values.push(data.id);
values.push(item.id);
}
self.$element.val(values.join(self._valueSeparator));

35
tests/data/inputData-tests.js
View File

@ -34,7 +34,7 @@ test('test that options can be selected', function (assert) {
);
});
test('test that options can be unselected', function (assert) {
test('unselect the single selected option clears the value', function (assert) {
var options = new Options({
data: [
{
@ -59,6 +59,39 @@ test('test that options can be unselected', function (assert) {
);
});
test('options can be unselected individually', function (assert) {
var options = new Options({
data: [
{
id: 'test',
text: 'Test'
},
{
id: 'test2',
text: 'Test2'
},
{
id: 'test3',
text: 'Test3'
}
]
});
var $element = $('<input />');
$element.val('test,test2,test3');
var adapter = new InputAdapter($element, options);
adapter.unselect({
id: 'test2'
});
assert.equal(
$element.val(),
'test,test3',
'The value should contain all the still selected options'
);
});
test('default values can be set', function (assert) {
expect(4);