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

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

This commit is contained in:
Igor Vaynberg 2012-06-28 23:44:42 -07:00
commit 504bca4b43

View File

@ -1000,7 +1000,10 @@
// abstract
getPlaceholder: function () {
return this.opts.element.attr("placeholder") || this.opts.element.data("placeholder") || this.opts.placeholder;
return this.opts.element.attr("placeholder") ||
this.opts.element.attr("data-placeholder") || // jquery 1.4 compat
this.opts.element.data("placeholder") ||
this.opts.placeholder;
},
/**