From 77cc4a99b15f4639b56c29a1207dc04b459c5d54 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Fri, 19 Dec 2014 12:18:11 -0500 Subject: [PATCH] - re-added jquery ui --- interface/web/js/scrigo.js.php | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php index d0585ad..6768f8f 100644 --- a/interface/web/js/scrigo.js.php +++ b/interface/web/js/scrigo.js.php @@ -1,5 +1,4 @@ <?php -session_start(); include '../../lib/config.inc.php'; header('Content-Type: text/javascript; charset=utf-8'); // the config file sets the content type header so we have to override it here! require_once '../../lib/app.inc.php'; @@ -103,7 +102,8 @@ } } }); - $('.chosen-select').chosen({no_results_text: "<?php echo $wb['globalsearch_noresults_text_txt']; ?>", width: '300px'}); + /* TODO: find a better way! */ + //$('.chosen-select').chosen({no_results_text: "<?php echo $wb['globalsearch_noresults_text_txt']; ?>", width: '300px'}); <?php } ?> @@ -419,7 +419,7 @@ }, success: function(data, textStatus, jqXHR) { hideLoadIndicator(); - jQuery('#sideNav').html(jqXHR.responseText); + jQuery('#sidebar').html(jqXHR.responseText); }, error: function() { hideLoadIndicator(); @@ -436,7 +436,7 @@ }, success: function(data, textStatus, jqXHR) { hideLoadIndicator(); - jQuery('#topNav').html(jqXHR.responseText); + jQuery('#topnav-container').html(jqXHR.responseText); }, error: function(o) { hideLoadIndicator(); @@ -447,6 +447,8 @@ } function changeTab(tab,target,force) { + if(requestsRunning > 0) return false; + //document.forms[0].next_tab.value = tab; document.pageForm.next_tab.value = tab; @@ -818,7 +820,7 @@ oldPWField.remove(); var pword = password(<?php echo $min_password_length; ?>, false, 1); jQuery('#'+repeatPasswordFieldID).val(pword); - newPWField.attr('id', passwordFieldID).val(pword).trigger('keyup'); + newPWField.attr('id', passwordFieldID).val(pword).trigger('keyup').select(); } var funcDisableClick = function(e) { e.preventDefault(); return false; }; -- Gitblit v1.9.1