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

only call initSelection() when there is actual input. avoids making users implement empty input check in their initSelection()s

Browse Source
This commit is contained in:
Igor Vaynberg 2012-04-10 07:45:09 -07:00
parent 19810405ce
commit a16190c822
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
select2.js
View File

@ -444,7 +444,6 @@
}); });
return data; return data;
} }
} }
} }
} }
@ -838,11 +837,13 @@
})); }));
if ($.isFunction(this.opts.initSelection)) { if ($.isFunction(this.opts.initSelection)) {
if (this.select || this.opts.element.val() !== "") {
selected = this.opts.initSelection.call(null, this.opts.element); selected = this.opts.initSelection.call(null, this.opts.element);
if (selected !== undefined && selected != null) { if (selected !== undefined && selected != null) {
this.updateSelection(selected); this.updateSelection(selected);
} }
} }
}
this.setPlaceholder(); this.setPlaceholder();
}; };
@ -1074,11 +1075,13 @@
})); }));
if ($.isFunction(this.opts.initSelection)) { if ($.isFunction(this.opts.initSelection)) {
if (this.select || this.opts.element.val() !== "") {
data = this.opts.initSelection.call(null, this.opts.element); data = this.opts.initSelection.call(null, this.opts.element);
if (data !== undefined && data != null) { if (data !== undefined && data != null) {
this.updateSelection(data); this.updateSelection(data);
} }
} }
}
// set the placeholder if necessary // set the placeholder if necessary
this.clearSearch(); this.clearSearch();
@ -1324,7 +1327,7 @@
return (value === undefined) ? this : value; return (value === undefined) ? this : value;
}; };
// exports // exports
window.Select2 = { window.Select2 = {
query: { query: {
ajax: ajax, ajax: ajax,
@ -1338,4 +1341,7 @@
} }
}; };
}(jQuery)); }
(jQuery)
)
;