From 559b657f9fc6a5374de9b7b1caf20abd4e308d76 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 13 Oct 2014 06:38:11 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/js/scrigo.js.php | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php
index 5e65ee0..d0585ad 100644
--- a/interface/web/js/scrigo.js.php
+++ b/interface/web/js/scrigo.js.php
@@ -94,7 +94,15 @@
<?php
if($server_config_array['misc']['use_combobox'] == 'y'){
?>
- $('#pageContent').find("select:not(.chosen-select)").combobox();
+
+
+ $('#pageContent').find("select:not(.chosen-select)").combobox({
+ select: function (event, ui) {
+ if (jQuery(".panel #Filter").length > 0) {
+ jQuery(".panel #Filter").trigger('click');
+ }
+ }
+ });
$('.chosen-select').chosen({no_results_text: "<?php echo $wb['globalsearch_noresults_text_txt']; ?>", width: '300px'});
<?php
}
@@ -845,13 +853,13 @@
return Math.floor(Math.random() * (max - min + 1)) + min;
}
-jQuery('.addPlaceholder').live("click", function(){
+jQuery('.addPlaceholder').on("click", function(){
var placeholderText = jQuery(this).text();
var template = jQuery(this).siblings(':input');
template.insertAtCaret(placeholderText);
});
-jQuery('.addPlaceholderContent').live("click", function(){
+jQuery('.addPlaceholderContent').on("click", function(){
var placeholderContentText = jQuery(this).find('.addPlaceholderContent').text();
var template2 = jQuery(this).siblings(':input');
template2.insertAtCaret(placeholderContentText);
--
Gitblit v1.9.1