Merge branch 'master' of git://github.com/ivaynberg/select2
This commit is contained in:
commit
5ae45f4124
@ -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;
|
||||
},
|
||||
|
||||
/**
|
||||
|
Loading…
x
Reference in New Issue
Block a user