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

Fixed default selections for arrays

Browse Source
This commit is contained in:
Kevin Brown 2014-11-07 19:53:46 -05:00
parent e3deb3ae03
commit d411a0fa76
9 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1137,7 +1137,8 @@ define('select2/data/select',[
data = {
id: $option.val(),
text: $option.html(),
disabled: $option.prop('disabled')
disabled: $option.prop('disabled'),
selected: $option.prop('selected')
};
} else if ($option.is('optgroup')) {
data = {
@ -1244,9 +1245,9 @@ define('select2/data/array',[
continue;
}
var option = this.option(item);
var $option = this.option(item);
this.$element.append(option);
this.$element.append($option);
}
};

7
dist/js/select2.amd.js vendored
View File

@ -1137,7 +1137,8 @@ define('select2/data/select',[
data = {
id: $option.val(),
text: $option.html(),
disabled: $option.prop('disabled')
disabled: $option.prop('disabled'),
selected: $option.prop('selected')
};
} else if ($option.is('optgroup')) {
data = {
@ -1244,9 +1245,9 @@ define('select2/data/array',[
continue;
}
var option = this.option(item);
var $option = this.option(item);
this.$element.append(option);
this.$element.append($option);
}
};

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

@ -10672,7 +10672,8 @@ define('select2/data/select',[
data = {
id: $option.val(),
text: $option.html(),
disabled: $option.prop('disabled')
disabled: $option.prop('disabled'),
selected: $option.prop('selected')
};
} else if ($option.is('optgroup')) {
data = {
@ -10779,9 +10780,9 @@ define('select2/data/array',[
continue;
}
var option = this.option(item);
var $option = this.option(item);
this.$element.append(option);
this.$element.append($option);
}
};

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

File diff suppressed because one or more lines are too long

7
dist/js/select2.js vendored
View File

@ -1565,7 +1565,8 @@ define('select2/data/select',[
data = {
id: $option.val(),
text: $option.html(),
disabled: $option.prop('disabled')
disabled: $option.prop('disabled'),
selected: $option.prop('selected')
};
} else if ($option.is('optgroup')) {
data = {
@ -1672,9 +1673,9 @@ define('select2/data/array',[
continue;
}
var option = this.option(item);
var $option = this.option(item);
this.$element.append(option);
this.$element.append($option);
}
};

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

File diff suppressed because one or more lines are too long

9
docs/examples.html
View File

@ -473,15 +473,6 @@ $.fn.select2.amd.require(
var data = [{ id: 0, text: 'enhancement' }, { id: 1, text: 'bug' }, { id: 2, text: 'duplicate' }, { id: 3, text: 'invalid' }, { id: 4, text: 'wontfix' }];
var data = [];
for (var i = 0; i < 9999; i++) {
data.push({
id: i.toString(),
text: i
});
}
var $ajax = $(".js-example-data-ajax");
var $disabledResults = $(".js-example-disabled-results");

4
src/js/select2/data/array.js vendored
View File

@ -46,9 +46,9 @@ define([
continue;
}
var option = this.option(item);
var $option = this.option(item);
this.$element.append(option);
this.$element.append($option);
}
};

3
src/js/select2/data/select.js vendored
View File

@ -158,7 +158,8 @@ define([
data = {
id: $option.val(),
text: $option.html(),
disabled: $option.prop('disabled')
disabled: $option.prop('disabled'),
selected: $option.prop('selected')
};
} else if ($option.is('optgroup')) {
data = {