Allow setting a placeholder from data attribute

Use data-placeholder="" on the select fixes danielfarrell#12
jpfuentes2 · Apr 20, 2012 · 9617675 · 9617675
1 parent df3a3d3
commit 9617675
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/js/bootstrap-combobox.js b/js/bootstrap-combobox.js
@@ -30,7 +30,7 @@
     this.sorter = this.options.sorter || this.sorter
     this.highlighter = this.options.highlighter || this.highlighter
     this.$menu = $(this.options.menu).appendTo('body')
-    this.placeholder = this.options.placeholder || this.placeholder
+    this.placeholder = this.options.placeholder || this.$target.attr('data-placeholder')
     this.$element.attr('placeholder', this.placeholder)
     this.shown = false
     this.refresh()

diff --git a/js/tests/unit/bootstrap-combobox.js b/js/tests/unit/bootstrap-combobox.js
@@ -220,4 +220,12 @@ $(function () {
 
         equals($input.attr('placeholder'), 'Type something...', 'input value was correctly set')
       })
+
+      test("should set placeholder text on the input if specified as an data attribute", function() {
+        var $select = $('<select data-placeholder="Type something..."><option></option><option>aa</option><option selected>ab</option><option>ac</option></select>')
+          , $input = $select.combobox().data('combobox').$element
+          , combobox = $select.data('combobox')
+
+        equals($input.attr('placeholder'), 'Type something...', 'input value was correctly set')
+      })
 })