crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

uniformisation du message de chargement lors de requètes AJAX

Browse source 
darcs-hash:20080520184139-69ccb-edc1f4210c9e0318b389508c8487d46fa8a319b0.gz
This commit is contained in:
Grgoire Dtrez 2008-05-20 20:41:39 +02:00
parent cc0de6a5aa
commit 1a1f5a5cb6
3 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
intranet/modules/mesMachines/static/machines.js
View file

@ -47,7 +47,6 @@ Machines.listeMachines.load = function()
Machines.listeMachines.display = function(result) Machines.listeMachines.display = function(result)
{ {
Crans.loading.display(false);
log("display liste"); log("display liste");
replaceChildNodes( "gestion_machines_main_frame", replaceChildNodes( "gestion_machines_main_frame",
@ -105,7 +104,6 @@ Machines.infoPane.loadInfo = function(mid)
Machines.infoPane.display = function(result) Machines.infoPane.display = function(result)
{ {
Crans.loading.display(false);
if (result.nom) { if (result.nom) {
log("displaying info : " + result.mid); log("displaying info : " + result.mid);
// building pane // building pane
@ -239,7 +237,6 @@ Machines.actions.makeActionLink = function(actionName)
Machines.actions.callback = function(result) { Machines.actions.callback = function(result) {
Crans.loading.display(false);
if (result.message){ if (result.message){
log(result.message); log(result.message);
Crans.messages.setMessage(result.message); Crans.messages.setMessage(result.message);

15
intranet/static/scripts/AJAX.js
View file

@ -3,15 +3,24 @@
*****************************/ *****************************/
AJAX = {}; AJAX = {};
AJAX.call = function(page, callBack, loadingMessage) {
AJAX.call = function(page, callBack) { var loadingMessage = (loadingMessage == null) ? true : loadingMessage;
logDebug("calling AJAX : " + page); //console.debug("calling AJAX : " + page);
if (loadingMessage) {
Crans.loading.display(true);
oldCallBack = callBack;
callBack = function(r) {
Crans.loading.display(false);
oldCallBack( r );
};
}
var e = loadJSONDoc(page); var e = loadJSONDoc(page);
e.addCallback(callBack); e.addCallback(callBack);
e.addErrback(AJAX.errorHandler); e.addErrback(AJAX.errorHandler);
} }
AJAX.errorHandler = function(d) { AJAX.errorHandler = function(d) {
Crans.loading.display(false);
appendChildNodes(document.body, appendChildNodes(document.body,
DIV({"class":"crans_ajax_error"}, DIV({"class":"crans_ajax_error"},
DIV({}, DIV({},

2
intranet/static/scripts/crans.js
View file

@ -75,7 +75,7 @@ Crans.loading.display = function(bool) {
if (bool) { if (bool) {
appear(loadingEl); appear(loadingEl);
} else { } else {
fade(loadingEl); fade(loadingEl, {duration:0.1});
} }
} }
return false; return false;