From aea43bbcd1a3671bb0b1292cea6eb145d70a5be7 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Tue, 09 Oct 2012 08:12:54 -0400
Subject: [PATCH] Bugfix: select box width in chrome
---
interface/web/js/scrigo.js.php | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php
index 04803a1..1d5d507 100644
--- a/interface/web/js/scrigo.js.php
+++ b/interface/web/js/scrigo.js.php
@@ -50,9 +50,13 @@
function hideLoadIndicator() {
requestsRunning -= 1;
if(requestsRunning < 1) {
- jQuery('#ajaxloader').fadeOut('fast');
+ jQuery('#ajaxloader').fadeOut('fast', function() { jQuery('#ajaxloader').hide(); } );
requestsRunning = 0; // just for the case...
}
+}
+
+function onAfterContentLoad() {
+ $('#pageContent').find("select").combobox();
}
function loadContentRefresh(pagename) {
@@ -68,6 +72,7 @@
success: function(data, textStatus, jqXHR) {
hideLoadIndicator();
jQuery('#pageContent').html(jqXHR.responseText);
+ onAfterContentLoad();
pageFormChanged = false;
},
error: function() {
@@ -88,7 +93,6 @@
showLoadIndicator();
},
success: function(data, textStatus, jqXHR) {
- hideLoadIndicator();
if(jqXHR.responseText != '') {
if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
var parts = jqXHR.responseText.split(':');
@@ -101,6 +105,7 @@
}
}
loadMenus();
+ hideLoadIndicator();
},
error: function() {
hideLoadIndicator();
@@ -130,7 +135,6 @@
showLoadIndicator();
},
success: function(data, textStatus, jqXHR) {
- hideLoadIndicator();
if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
var parts = jqXHR.responseText.split(':');
//alert(parts[1]);
@@ -142,9 +146,11 @@
document.location.href = 'index.php';
} else {
jQuery('#pageContent').html(jqXHR.responseText);
+ onAfterContentLoad();
pageFormChanged = false;
}
loadMenus();
+ hideLoadIndicator();
},
error: function() {
hideLoadIndicator();
@@ -170,7 +176,6 @@
showLoadIndicator();
},
success: function(data, textStatus, jqXHR) {
- hideLoadIndicator();
if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
var parts = jqXHR.responseText.split(':');
//alert(parts[1]);
@@ -179,8 +184,10 @@
//window.setTimeout('loadContent(redirect)', 1000);
} else {
jQuery('#pageContent').html(jqXHR.responseText);
+ onAfterContentLoad();
pageFormChanged = false;
}
+ hideLoadIndicator();
},
error: function(jqXHR, textStatus, errorThrown) {
hideLoadIndicator();
@@ -207,7 +214,6 @@
showLoadIndicator();
},
success: function(data, textStatus, jqXHR) {
- hideLoadIndicator();
if(successMessage) alert(successMessage);
if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
var parts = jqXHR.responseText.split(':');
@@ -217,8 +223,10 @@
//window.setTimeout('loadContent(redirect)', 1000);
} else {
jQuery('#pageContent').html(jqXHR.responseText);
+ onAfterContentLoad();
pageFormChanged = false;
}
+ hideLoadIndicator();
},
error: function(jqXHR, textStatus, errorThrown) {
hideLoadIndicator();
@@ -280,7 +288,6 @@
showLoadIndicator();
},
success: function(data, textStatus, jqXHR) {
- hideLoadIndicator();
if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
var parts = jqXHR.responseText.split(':');
loadContent(parts[1]);
@@ -294,8 +301,10 @@
//jQuery.each(reponseScript, function(idx, val) { eval(val.text); } );
jQuery('#pageContent').html(jqXHR.responseText);
+ onAfterContentLoad();
pageFormChanged = false;
}
+ hideLoadIndicator();
},
error: function() {
hideLoadIndicator();
@@ -314,14 +323,15 @@
showLoadIndicator();
},
success: function(data, textStatus, jqXHR) {
- hideLoadIndicator();
if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
var parts = jqXHR.responseText.split(":");
loadContent(parts[1]);
} else {
jQuery('#pageContent').html(jqXHR.responseText);
+ onAfterContentLoad();
pageFormChanged = false;
}
+ hideLoadIndicator();
},
error: function() {
hideLoadIndicator();
@@ -445,10 +455,10 @@
url: pagename,
dataType: "html",
beforeSend: function() {
- showLoadIndicator();
+// showLoadIndicator();
},
success: function(data, textStatus, jqXHR) {
- hideLoadIndicator();
+// hideLoadIndicator();
var teste = jqXHR.responseText;
var elemente = teste.split('#');
el=document.getElementById(elementid);
@@ -462,7 +472,7 @@
}
},
error: function() {
- hideLoadIndicator();
+// hideLoadIndicator();
reportError('Ajax Request was not successful. 119');
}
});
--
Gitblit v1.9.1