From 1a1f5a5cb67e17ceeffacda283b8a9e81f41772a Mon Sep 17 00:00:00 2001
From: Grgoire Dtrez <gdetrez@crans.org>
Date: Tue, 20 May 2008 20:41:39 +0200
Subject: [PATCH] =?UTF-8?q?uniformisation=20du=20message=20de=20chargement?=
 =?UTF-8?q?=20lors=20de=20requ=C3=A8tes=20AJAX?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

darcs-hash:20080520184139-69ccb-edc1f4210c9e0318b389508c8487d46fa8a319b0.gz
---
 intranet/modules/mesMachines/static/machines.js |  3 ---
 intranet/static/scripts/AJAX.js                 | 15 ++++++++++++---
 intranet/static/scripts/crans.js                |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/intranet/modules/mesMachines/static/machines.js b/intranet/modules/mesMachines/static/machines.js
index bd5fb1ce..b3f31e91 100644
--- a/intranet/modules/mesMachines/static/machines.js
+++ b/intranet/modules/mesMachines/static/machines.js
@@ -47,7 +47,6 @@ Machines.listeMachines.load = function()
 
 Machines.listeMachines.display = function(result) 
 {
-   Crans.loading.display(false);
    log("display liste");
    
    replaceChildNodes( "gestion_machines_main_frame",
@@ -105,7 +104,6 @@ Machines.infoPane.loadInfo = function(mid)
 
 Machines.infoPane.display = function(result) 
 {
-   Crans.loading.display(false);
    if (result.nom) {
       log("displaying info : " + result.mid);
       // building pane
@@ -239,7 +237,6 @@ Machines.actions.makeActionLink = function(actionName)
 
 
 Machines.actions.callback = function(result) {
-   Crans.loading.display(false);
    if (result.message){
       log(result.message);
       Crans.messages.setMessage(result.message);
diff --git a/intranet/static/scripts/AJAX.js b/intranet/static/scripts/AJAX.js
index e40702e4..5cd667de 100644
--- a/intranet/static/scripts/AJAX.js
+++ b/intranet/static/scripts/AJAX.js
@@ -3,15 +3,24 @@
  *****************************/
 AJAX = {};
 
-
-AJAX.call = function(page, callBack) {
-   logDebug("calling AJAX : " + page);
+AJAX.call = function(page, callBack, loadingMessage) {
+   var loadingMessage = (loadingMessage == null) ? true : loadingMessage;
+   //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);
    e.addCallback(callBack);
    e.addErrback(AJAX.errorHandler);
 }
 
 AJAX.errorHandler = function(d) {
+   Crans.loading.display(false);
    appendChildNodes(document.body, 
 		    DIV({"class":"crans_ajax_error"},
 			DIV({}, 
diff --git a/intranet/static/scripts/crans.js b/intranet/static/scripts/crans.js
index 63133097..683ffe92 100644
--- a/intranet/static/scripts/crans.js
+++ b/intranet/static/scripts/crans.js
@@ -75,7 +75,7 @@ Crans.loading.display = function(bool) {
       if (bool) {
 	 appear(loadingEl);
       } else {
-	 fade(loadingEl);
+	 fade(loadingEl, {duration:0.1});
       }
    }
    return false;