projects
/
euphorik.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
REPORT branche 1.1 501->501
[euphorik.git]
/
js
/
pageMinichat
/
conversations.js
diff --git
a/js/pageMinichat/conversations.js
b/js/pageMinichat/conversations.js
index
94236c1
..
378c2a2
100644
(file)
--- a/
js/pageMinichat/conversations.js
+++ b/
js/pageMinichat/conversations.js
@@
-371,6
+371,8
@@
euphorik.Conversations.prototype.rafraichirMessages = function(vider) {
conv.idDernierMessageAffiche = 0;
\r
});
\r
}
\r
conv.idDernierMessageAffiche = 0;
\r
});
\r
}
\r
+
+ thisConversations.util.showWaitBar(); // pour faire patienter le user :)
\r
this.comet.waitEvent(
\r
function() { return thisConversations.getJSONrafraichirMessages(); },
\r
\r
this.comet.waitEvent(
\r
function() { return thisConversations.getJSONrafraichirMessages(); },
\r
@@
-387,7
+389,8
@@
euphorik.Conversations.prototype.rafraichirMessages = function(vider) {
$("#trollCourant .troll a[@rel*=lightbox]").lightBox();
\r
},
\r
"new_messages" :
\r
$("#trollCourant .troll a[@rel*=lightbox]").lightBox();
\r
},
\r
"new_messages" :
\r
- function(data) {
\r
+ function(data) {
+
\r
if (vider) {
\r
thisConversations.viderMessages();
\r
}
\r
if (vider) {
\r
thisConversations.viderMessages();
\r
}
\r
@@
-404,7
+407,9
@@
euphorik.Conversations.prototype.rafraichirMessages = function(vider) {
thisConversations.afficherMessagesRepondConversations();
\r
}
\r
\r
thisConversations.afficherMessagesRepondConversations();
\r
}
\r
\r
- vider = false;
\r
+ vider = false;
+
+ thisConversations.util.hideWaitBar();
\r
}
\r
}
\r
);
\r
}
\r
}
\r
);
\r