projects
/
euphorik.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f2eb4c4
)
FIX bug dans la mise en évidence
author
Greg Burri
<greg.burri@gmail.com>
Sat, 26 Jul 2008 14:40:30 +0000
(14:40 +0000)
committer
Greg Burri
<greg.burri@gmail.com>
Sat, 26 Jul 2008 14:40:30 +0000
(14:40 +0000)
js/pageMinichat/conversation.js
patch
|
blob
|
history
js/pageMinichat/message.js
patch
|
blob
|
history
styles/1/img/fleche_proprietaire.png
patch
|
blob
|
history
styles/1/pageMinichat.css
patch
|
blob
|
history
diff --git
a/js/pageMinichat/conversation.js
b/js/pageMinichat/conversation.js
index
20343f9
..
3948629
100644
(file)
--- a/
js/pageMinichat/conversation.js
+++ b/
js/pageMinichat/conversation.js
@@
-410,7
+410,7
@@
euphorik.Conversation.prototype.afficherConversation = function(id) {
function() {
\r
var jq = $(this);
\r
var statut = mess[thisConversation.idMessageFromString(jq.attr("id"))];
\r
function() {
\r
var jq = $(this);
\r
var statut = mess[thisConversation.idMessageFromString(jq.attr("id"))];
\r
- if (
!statut
) {
\r
+ if (
statut === undefined
) {
\r
jq.addClass("cache");
\r
} else {
\r
jq.removeClass("cache");
\r
jq.addClass("cache");
\r
} else {
\r
jq.removeClass("cache");
\r
diff --git
a/js/pageMinichat/message.js
b/js/pageMinichat/message.js
index
c77ac58
..
67ba7e6
100644
(file)
--- a/
js/pageMinichat/message.js
+++ b/
js/pageMinichat/message.js
@@
-82,27
+82,26
@@
euphorik.Message.prototype.getConversation = function(messages) {
\r
// les messages faisant partie de la conversation
\r
var messagesEnEvidence = {};
\r
\r
// les messages faisant partie de la conversation
\r
var messagesEnEvidence = {};
\r
-
\r
messagesEnEvidence[this.id] = 1;
\r
\r
// parcours en profondeur
\r
messagesEnEvidence[this.id] = 1;
\r
\r
// parcours en profondeur
\r
- var f = function(
m
, premierNiveau, ensemble, evidence) {
\r
- objectEach(
m[ensemble]
, function(id) {
\r
+ var f = function(
ids
, premierNiveau, ensemble, evidence) {
\r
+ objectEach(
ids
, function(id) {
\r
if (!messagesEnEvidence[id] || premierNiveau) {
\r
var message = messages.messagesParId[id];
\r
if (message) {
\r
messagesEnEvidence[id] = premierNiveau ? evidence : (message.auteurId === thisMessage.auteurId ? 1 : 0);
\r
if (!messagesEnEvidence[id] || premierNiveau) {
\r
var message = messages.messagesParId[id];
\r
if (message) {
\r
messagesEnEvidence[id] = premierNiveau ? evidence : (message.auteurId === thisMessage.auteurId ? 1 : 0);
\r
- f(message, false, ensemble, evidence);
\r
+ f(message
[ensemble]
, false, ensemble, evidence);
\r
}
\r
}
\r
});
\r
};
\r
\r
// remonte le temps
\r
}
\r
}
\r
});
\r
};
\r
\r
// remonte le temps
\r
- f(this, true, "estReponduPar", 2);
\r
+ f(this
.estReponduPar
, true, "estReponduPar", 2);
\r
\r
// descent le temps
\r
\r
// descent le temps
\r
- f(this, true, "repondA", 3);
\r
+ f(this
.repondA
, true, "repondA", 3);
\r
\r
return messagesEnEvidence;
\r
};
\r
\r
return messagesEnEvidence;
\r
};
\r
diff --git
a/styles/1/img/fleche_proprietaire.png
b/styles/1/img/fleche_proprietaire.png
index
38845e2
..
3f17c3c
100644
(file)
Binary files a/styles/1/img/fleche_proprietaire.png and b/styles/1/img/fleche_proprietaire.png differ
diff --git
a/styles/1/pageMinichat.css
b/styles/1/pageMinichat.css
index
71f6a08
..
6f386ce
100755
(executable)
--- a/
styles/1/pageMinichat.css
+++ b/
styles/1/pageMinichat.css
@@
-244,7
+244,7
@@
background-image: url(img/fleche_repondu.png);
}
#page.minichat div.message.proprietaire .entete {
background-image: url(img/fleche_repondu.png);
}
#page.minichat div.message.proprietaire .entete {
- background-color: #
13920f
+ background-color: #
350a0a
}
#page.minichat div.message.proprietaire .delimitationEntete,
#page.minichat div.message.proprietaire .repondA {
}
#page.minichat div.message.proprietaire .delimitationEntete,
#page.minichat div.message.proprietaire .repondA {