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

make sure data() returns null instead of undefined when unset. this will prevent chaining which may seem weid. fixes #230

Browse Source
This commit is contained in:
Igor Vaynberg 2012-07-18 09:56:02 +03:00
parent de0d11a82b
commit ad9fac45ae
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
select2.js
View File

@ -1281,7 +1281,6 @@
initSelection: function () { initSelection: function () {
var selected; var selected;
if (this.opts.element.val() === "") { if (this.opts.element.val() === "") {
this.updateSelection({id: "", text: ""});
this.close(); this.close();
this.setPlaceholder(); this.setPlaceholder();
} else { } else {
@ -1322,11 +1321,8 @@
// check for a first blank option if attached to a select // check for a first blank option if attached to a select
if (this.select && this.select.find("option:first").text() !== "") return; if (this.select && this.select.find("option:first").text() !== "") return;
if (typeof(placeholder) === "object") { this.selection.find("span").html(placeholder);
this.updateSelection(placeholder);
} else {
this.selection.find("span").html(placeholder);
}
this.selection.addClass("select2-default"); this.selection.addClass("select2-default");
this.selection.find("abbr").hide(); this.selection.find("abbr").hide();
@ -1431,8 +1427,12 @@
// single // single
data: function(value) { data: function(value) {
var data;
if (arguments.length === 0) { if (arguments.length === 0) {
return this.selection.data("select2-data"); data = this.selection.data("select2-data");
if (data == undefined) data = null;
return data;
} else { } else {
if (!value || value === "") { if (!value || value === "") {
this.clear(); this.clear();