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

Merge pull request #2129 from campbell/master

Browse Source 
Bugfix - only selected options that are not disabled should be used when initializing a dropdown
This commit is contained in:
Kevin Brown 2014-02-21 10:27:01 -05:00
commit b2b5ebd637
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
select2.js
View File

@ -2214,7 +2214,7 @@ the specific language governing permissions and limitations under the Apache Lic
if (opts.element.get(0).tagName.toLowerCase() === "select") { if (opts.element.get(0).tagName.toLowerCase() === "select") {
// install the selection initializer // install the selection initializer
opts.initSelection = function (element, callback) { opts.initSelection = function (element, callback) {
var selected = element.find("option").filter(function() { return this.selected }); var selected = element.find("option").filter(function() { return this.selected && !this.disabled });
// a single select box always has a value, no need to null check 'selected' // a single select box always has a value, no need to null check 'selected'
callback(self.optionToData(selected)); callback(self.optionToData(selected));
}; };
@ -2488,7 +2488,7 @@ the specific language governing permissions and limitations under the Apache Lic
var data = []; var data = [];
element.find("option").filter(function() { return this.selected }).each2(function (i, elm) { element.find("option").filter(function() { return this.selected && !this.disabled }).each2(function (i, elm) {
data.push(self.optionToData(elm)); data.push(self.optionToData(elm));
}); });
callback(data); callback(data);