From 015dffdc589b396d72092583cc526674f0a9a8d5 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 18 Nov 2013 07:36:00 -0500
Subject: [PATCH] Merge remote-tracking branch 'sebj/master' and tidied up merged code
---
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 3927b80..2da73cb 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