1
0
mirror of synced 2025-03-10 22:56:12 +03:00

Merge branch 'master' of git://github.com/ivaynberg/select2

This commit is contained in:
Igor Vaynberg 2012-05-02 22:52:27 -07:00
commit 5ae45f4124

View File

@ -758,9 +758,7 @@
},
getPlaceholder: function () {
var placeholder = this.opts.element.data("placeholder");
if (placeholder !== undefined) return placeholder;
return this.opts.placeholder;
return this.opts.element.attr("placeholder") || this.opts.element.data("placeholder") || this.opts.placeholder;
},
/**