Merge 3e7b242 into 6fbea9a

selectize · May 4, 2016 · 1b79695 · 1b79695
2 parents 6fbea9a + 3e7b242
commit 1b79695
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/selectize.js b/src/selectize.js
@@ -1679,7 +1679,7 @@ $.extend(Selectize.prototype, {
 		if (!this.settings.placeholder) return;
 		var $input = this.$control_input;
 
-		if (this.items.length) {
+      		if ( this.items.length && !this.settings.keepPlaceholder || this.order == this.items.length || this.settings.maxItems != null && this.items.length >= this.settings.maxItems  ) {
 			$input.removeAttr('placeholder');
 		} else {
 			$input.attr('placeholder', this.settings.placeholder);