From b4945ae0c3f4e108090d05b34b3e7df8a753a2ec Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 07 Jul 2014 13:07:17 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/js/scrigo.js.php | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php
index 4e51cd5..5e65ee0 100644
--- a/interface/web/js/scrigo.js.php
+++ b/interface/web/js/scrigo.js.php
@@ -94,7 +94,8 @@
<?php
if($server_config_array['misc']['use_combobox'] == 'y'){
?>
- $('#pageContent').find("select").combobox();
+ $('#pageContent').find("select:not(.chosen-select)").combobox();
+ $('.chosen-select').chosen({no_results_text: "<?php echo $wb['globalsearch_noresults_text_txt']; ?>", width: '300px'});
<?php
}
?>
--
Gitblit v1.9.1