From 4d29e42f99f7a9b703be4764034d6794464dad26 Mon Sep 17 00:00:00 2001
From: Dominik <info@profi-webdesign.net>
Date: Sun, 11 Jan 2015 09:40:09 -0500
Subject: [PATCH] Merge remote-tracking branch 'ispc3master/master'
---
interface/web/js/scrigo.js.php | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php
index 6aaf6fd..f85f825 100644
--- a/interface/web/js/scrigo.js.php
+++ b/interface/web/js/scrigo.js.php
@@ -87,6 +87,22 @@
}
}
+function onAfterSideNavLoaded() {
+ <?php
+if($server_config_array['misc']['use_combobox'] == 'y'){
+?>
+ $('#sidebar').find("select:not(.chosen-select)").select2({
+ placeholder: '',
+ width: 'element',
+ selectOnBlur: true,
+ allowClear: true,
+ });
+<?php
+}
+?>
+
+}
+
function onAfterContentLoad(url, data) {
if(!data) data = '';
else data = '&' + data;
@@ -95,7 +111,7 @@
?>
- $('#pageContent,#sidebar').find("select:not(.chosen-select)").select2({
+ $('#pageContent').find("select:not(.chosen-select)").select2({
placeholder: '',
width: 'element',
selectOnBlur: true,
@@ -431,6 +447,7 @@
success: function(data, textStatus, jqXHR) {
hideLoadIndicator();
jQuery('#sidebar').html(jqXHR.responseText);
+ onAfterSideNavLoaded();
loadPushyMenu();
},
error: function() {
--
Gitblit v1.9.1