From 94d985e0c468b67f8177592047311498ffd883d2 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 5 Mar 2012 16:26:28 +0100 Subject: [PATCH] MINOR Only disable chosen.js placeholder if no custom one exists --- admin/javascript/LeftAndMain.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/admin/javascript/LeftAndMain.js b/admin/javascript/LeftAndMain.js index 0ace013e6..6d4ccb7e3 100644 --- a/admin/javascript/LeftAndMain.js +++ b/admin/javascript/LeftAndMain.js @@ -367,7 +367,11 @@ jQuery.noConflict(); onmatch: function() { if(this.is('.no-chzn')) return; - this.data('placeholder', ' ').chosen().addClass("has-chzn"); + // Explicitly disable default placeholder if no custom one is defined + if(!this.data('placeholder')) this.data('placeholder', ' '); + + // Apply chosen + this.chosen().addClass("has-chzn"); this._super(); }