Browse Source

Merge pull request #56 from ProLoser/master

Added support for [placeholder] attribute
Igor Vaynberg 13 years ago
parent
commit
a1457fa491
1 changed files with 1 additions and 3 deletions
  1. 1 3
      select2.js

+ 1 - 3
select2.js

@@ -758,9 +758,7 @@
         },
         },
 
 
         getPlaceholder: function () {
         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;
         },
         },
 
 
         /**
         /**