Merge branch 'master' of github.com:ivaynberg/select2
This commit is contained in:
commit
504bca4b43
@ -1000,7 +1000,10 @@
|
|||||||
|
|
||||||
// abstract
|
// abstract
|
||||||
getPlaceholder: function () {
|
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;
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user