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

Merge pull request #1795 from arendjr/master

Browse Source 
Don't rely on :selected, makes Select2 compatible with jQuery builds without Sizzle
This commit is contained in:
Igor Vaynberg 2013-10-15 08:04:21 -07:00
commit e84a1207d0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
select2.js
View File

@ -2119,7 +2119,7 @@ the specific language governing permissions and limitations under the Apache Lic
isPlaceholderOptionSelected: function() { isPlaceholderOptionSelected: function() {
var placeholderOption; var placeholderOption;
if (!this.getPlaceholder()) return false; // no placeholder specified so no option should be considered if (!this.getPlaceholder()) return false; // no placeholder specified so no option should be considered
return ((placeholderOption = this.getPlaceholderOption()) !== undefined && placeholderOption.is(':selected')) return ((placeholderOption = this.getPlaceholderOption()) !== undefined && placeholderOption.prop("selected"))
|| (this.opts.element.val() === "") || (this.opts.element.val() === "")
|| (this.opts.element.val() === undefined) || (this.opts.element.val() === undefined)
|| (this.opts.element.val() === null); || (this.opts.element.val() === null);
@ -2133,7 +2133,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(":selected"); var selected = element.find("option").filter(function() { return this.selected });
// 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));
}; };
@ -2303,7 +2303,7 @@ the specific language governing permissions and limitations under the Apache Lic
if (this.select) { if (this.select) {
this.select this.select
.val(val) .val(val)
.find(":selected").each2(function (i, elm) { .find("option").filter(function() { return this.selected }).each2(function (i, elm) {
data = self.optionToData(elm); data = self.optionToData(elm);
return false; return false;
}); });
@ -2398,7 +2398,7 @@ the specific language governing permissions and limitations under the Apache Lic
var data = []; var data = [];
element.find(":selected").each2(function (i, elm) { element.find("option").filter(function() { return this.selected }).each2(function (i, elm) {
data.push(self.optionToData(elm)); data.push(self.optionToData(elm));
}); });
callback(data); callback(data);