1
0
mirror of synced 2025-02-19 21:43:15 +03:00

Fixed string to object conversion

This commit is contained in:
Kevin Brown 2014-12-17 19:39:12 -05:00
parent ea41b627dc
commit fe136088f6
7 changed files with 58 additions and 23 deletions

View File

@ -2322,10 +2322,17 @@ define('select2/data/select',[
}; };
SelectAdapter.prototype._normalizeItem = function (item) { SelectAdapter.prototype._normalizeItem = function (item) {
$.extend(item, { if (!$.isPlainObject(item)) {
id: item, item = {
text: item id: item,
}); text: item
};
}
item = $.extend({}, {
id: '',
text: ''
}, item);
var defaults = { var defaults = {
selected: false, selected: false,

View File

@ -2322,10 +2322,17 @@ define('select2/data/select',[
}; };
SelectAdapter.prototype._normalizeItem = function (item) { SelectAdapter.prototype._normalizeItem = function (item) {
$.extend(item, { if (!$.isPlainObject(item)) {
id: item, item = {
text: item id: item,
}); text: item
};
}
item = $.extend({}, {
id: '',
text: ''
}, item);
var defaults = { var defaults = {
selected: false, selected: false,

View File

@ -11857,10 +11857,17 @@ define('select2/data/select',[
}; };
SelectAdapter.prototype._normalizeItem = function (item) { SelectAdapter.prototype._normalizeItem = function (item) {
$.extend(item, { if (!$.isPlainObject(item)) {
id: item, item = {
text: item id: item,
}); text: item
};
}
item = $.extend({}, {
id: '',
text: ''
}, item);
var defaults = { var defaults = {
selected: false, selected: false,

File diff suppressed because one or more lines are too long

15
dist/js/select2.js vendored
View File

@ -2750,10 +2750,17 @@ define('select2/data/select',[
}; };
SelectAdapter.prototype._normalizeItem = function (item) { SelectAdapter.prototype._normalizeItem = function (item) {
$.extend(item, { if (!$.isPlainObject(item)) {
id: item, item = {
text: item id: item,
}); text: item
};
}
item = $.extend({}, {
id: '',
text: ''
}, item);
var defaults = { var defaults = {
selected: false, selected: false,

File diff suppressed because one or more lines are too long

View File

@ -199,10 +199,17 @@ define([
}; };
SelectAdapter.prototype._normalizeItem = function (item) { SelectAdapter.prototype._normalizeItem = function (item) {
$.extend(item, { if (!$.isPlainObject(item)) {
id: item, item = {
text: item id: item,
}); text: item
};
}
item = $.extend({}, {
id: '',
text: ''
}, item);
var defaults = { var defaults = {
selected: false, selected: false,