projects
/
euphorik.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ed281cb
)
FIX plein de bugs introduits avec la Grand Restructuration
author
Greg Burri
<greg.burri@gmail.com>
Thu, 24 Jul 2008 21:37:13 +0000
(21:37 +0000)
committer
Greg Burri
<greg.burri@gmail.com>
Thu, 24 Jul 2008 21:37:13 +0000
(21:37 +0000)
js/pageMinichat/commandes.js
patch
|
blob
|
history
js/pageMinichat/conversation.js
patch
|
blob
|
history
js/pageMinichat/conversations.js
patch
|
blob
|
history
js/pageMinichat/message.js
patch
|
blob
|
history
js/pageMinichat/pageMinichat.js
patch
|
blob
|
history
js/pageProfile.js
patch
|
blob
|
history
styles/1/pageMinichat.css
patch
|
blob
|
history
diff --git
a/js/pageMinichat/commandes.js
b/js/pageMinichat/commandes.js
index
4d25a43
..
bae4604
100644
(file)
--- a/
js/pageMinichat/commandes.js
+++ b/
js/pageMinichat/commandes.js
@@
-61,7
+61,6
@@
euphorik.Commandes.prototype.exec = function(chaine) {
if (fragments.length === 0 || fragments[0].charAt(0) != '/') {
return [euphorik.Commandes.statut.pas_une_commande, ''];
}
if (fragments.length === 0 || fragments[0].charAt(0) != '/') {
return [euphorik.Commandes.statut.pas_une_commande, ''];
}
- console.log(fragments)
var nomCommande = fragments[0].slice(1);
var args = fragments.slice(1);
var nomCommande = fragments[0].slice(1);
var args = fragments.slice(1);
diff --git
a/js/pageMinichat/conversation.js
b/js/pageMinichat/conversation.js
index
77ee3a2
..
d8cd8a7
100644
(file)
--- a/
js/pageMinichat/conversation.js
+++ b/
js/pageMinichat/conversation.js
@@
-286,7
+286,7
@@
euphorik.Conversation.prototype.attacherEventsSurMessage = function(element) {
function(event) {
\r
// FIXME : ya pas mieux ?
\r
var racine = $(event.target).text();
\r
function(event) {
\r
// FIXME : ya pas mieux ?
\r
var racine = $(event.target).text();
\r
- thisConversation.conversations.ouvrirConversation(parseInt(
idString
.substring(1, racine.length - 1), 36));
\r
+ thisConversation.conversations.ouvrirConversation(parseInt(
racine
.substring(1, racine.length - 1), 36));
\r
return false;
\r
}
\r
);
\r
return false;
\r
}
\r
);
\r
diff --git
a/js/pageMinichat/conversations.js
b/js/pageMinichat/conversations.js
index
2d5df0c
..
277726d
100644
(file)
--- a/
js/pageMinichat/conversations.js
+++ b/
js/pageMinichat/conversations.js
@@
-93,12
+93,12
@@
euphorik.Conversations.prototype.ajouterMessageRepond = function(mess) {
var mess2;
\r
for (mess2 in this.messagesRepond) {
\r
if (this.messagesRepond.hasOwnProperty(mess2)) {
\r
var mess2;
\r
for (mess2 in this.messagesRepond) {
\r
if (this.messagesRepond.hasOwnProperty(mess2)) {
\r
+ mess2 = this.messagesRepond[mess2];
\r
break;
\r
}
\r
}
\r
break;
\r
}
\r
}
\r
- mess2 = this.messagesRepond[mess2];
\r
\r
\r
- if (mess2 && mess2.racineId == mess.racineId) {
\r
+ if (mess2 && mess2.racineId
!
== mess.racineId) {
\r
this.util.messageDialogue("Impossible de répondre à deux messages ne faisant pas partie de la même conversation");
\r
return;
\r
}
\r
this.util.messageDialogue("Impossible de répondre à deux messages ne faisant pas partie de la même conversation");
\r
return;
\r
}
\r
@@
-182,13
+182,14
@@
euphorik.Conversations.prototype.getJSONrafraichirMessages = function() {
};
\r
\r
euphorik.Conversations.prototype.getJSONConversations = function() {
\r
};
\r
\r
euphorik.Conversations.prototype.getJSONConversations = function() {
\r
+ var thisConversations = this
\r
var clientConv = [];
\r
\r
this.client.conversations.each(function(i, conv) {
\r
clientConv.push({
\r
root : conv.root,
\r
page : conv.page,
\r
var clientConv = [];
\r
\r
this.client.conversations.each(function(i, conv) {
\r
clientConv.push({
\r
root : conv.root,
\r
page : conv.page,
\r
- last_message_id : this
.conversations[i + 1] ? thi
s.conversations[i + 1].idDernierMessageAffiche : 0
\r
+ last_message_id : this
Conversations.conversations[i + 1] ? thisConversation
s.conversations[i + 1].idDernierMessageAffiche : 0
\r
});
\r
});
\r
return clientConv;
\r
});
\r
});
\r
return clientConv;
\r
diff --git
a/js/pageMinichat/message.js
b/js/pageMinichat/message.js
index
3afb8b5
..
9664064
100644
(file)
--- a/
js/pageMinichat/message.js
+++ b/
js/pageMinichat/message.js
@@
-92,11
+92,11
@@
euphorik.Message.prototype.getConversation = function(messages) {
var f = function(tabIds, premierNiveau) {
\r
objectEach(tabIds, function(id) {
\r
// si le message (id) a déjà été traité
\r
var f = function(tabIds, premierNiveau) {
\r
objectEach(tabIds, function(id) {
\r
// si le message (id) a déjà été traité
\r
- if (
messagesEnEvidence[id] || premierNiveau) {
\r
+ if (
!messagesEnEvidence[id] || premierNiveau) {
\r
var message = messages.messagesParId[id];
\r
var message = messages.messagesParId[id];
\r
- if (
!
message) {
\r
+ if (message) {
\r
messagesEnEvidence[id] = premierNiveau ? 3 : (message.auteurId === thisMessage.auteurId ? 1 : 0);
\r
messagesEnEvidence[id] = premierNiveau ? 3 : (message.auteurId === thisMessage.auteurId ? 1 : 0);
\r
- f
(message.repondA, false);
\r
+ f(message.repondA, false);
\r
}
\r
}
\r
});
\r
}
\r
}
\r
});
\r
diff --git
a/js/pageMinichat/pageMinichat.js
b/js/pageMinichat/pageMinichat.js
index
2283acb
..
2f53eb0
100755
(executable)
--- a/
js/pageMinichat/pageMinichat.js
+++ b/
js/pageMinichat/pageMinichat.js
@@
-96,7
+96,14
@@
euphorik.PageMinichat.prototype.charger = function() {
this.util.infoBulle("Cliquer sur les messages pour les enlevers de la liste",
$("form#posterMessage #repondA").hover(
this.util.infoBulle("Cliquer sur les messages pour les enlevers de la liste",
$("form#posterMessage #repondA").hover(
- function() { thisPage.util.afficherBoite($(".messages", this), $(this), euphorik.Util.positionTypeX.centre, euphorik.Util.positionTypeY.bas); },
+ function() {
+ thisPage.util.afficherBoite(
+ $(".messages", this),
+ $(this),
+ euphorik.Util.positionTypeX.centre,
+ thisPage.client.chatOrder === "reverse" ? euphorik.Util.positionTypeY.bas : euphorik.Util.positionTypeY.haut
+ );
+ },
function() { $(".messages", this).hide(); }
).click(
function(e) {
function() { $(".messages", this).hide(); }
).click(
function(e) {
@@
-259,10
+266,9
@@
euphorik.PageMinichat.prototype.envoyerMessage = function(pseudo, message) {
var mess = conv.messagesParId[messId];
if (mess) {
mess.clientARepondu = true;
var mess = conv.messagesParId[messId];
if (mess) {
mess.clientARepondu = true;
+ $("#conversations #" + mess.getId(conv.getId())).addClass("repondu")
}
});
}
});
- // TODO : ca sert à qque chose ?
- //$("#conversations div#" + thisPageMinichat.conversations.messagesRepond[messId].getId()).addClass("repondu")
});
$("form#posterMessage input.message").val("");
});
$("form#posterMessage input.message").val("");
diff --git
a/js/pageProfile.js
b/js/pageProfile.js
index
d7c4e62
..
fa7235b
100755
(executable)
--- a/
js/pageProfile.js
+++ b/
js/pageProfile.js
@@
-69,7
+69,7
@@
euphorik.PageProfile.prototype.chargerProfile = function() {
thisPage.client.chatOrder = $("form#profile select#chatOrder option:selected").attr("value");
\r
thisPage.client.nickFormat = $("form#profile select#affichagePseudo option:selected").attr("value");
\r
if (thisPage.client.ekMaster) {
\r
thisPage.client.chatOrder = $("form#profile select#chatOrder option:selected").attr("value");
\r
thisPage.client.nickFormat = $("form#profile select#affichagePseudo option:selected").attr("value");
\r
if (thisPage.client.ekMaster) {
\r
- thisPage.client.ostentatiousaster = $("form#profile select#degreeOstentatoire option:selected").attr("value");
\r
+ thisPage.client.ostentatious
M
aster = $("form#profile select#degreeOstentatoire option:selected").attr("value");
\r
}
\r
thisPage.client.viewTooltips = $("form#profile input#viewTooltips").attr("checked");
\r
thisPage.client.viewTimes = $("form#profile input#viewTimes").attr("checked");
\r
}
\r
thisPage.client.viewTooltips = $("form#profile input#viewTooltips").attr("checked");
\r
thisPage.client.viewTimes = $("form#profile input#viewTimes").attr("checked");
\r
@@
-142,7
+142,7
@@
euphorik.PageProfile.prototype.getHTML = function() {
' </tr>' +
\r
' <tr>' +
\r
(this.client.ekMaster ? '' +
\r
' </tr>' +
\r
' <tr>' +
\r
(this.client.ekMaster ? '' +
\r
- ' <td>Degrée d
' +
'ostentation</td>' +
\r
+ ' <td>Degrée d
\
'ostentation</td>' +
\r
' <td>' +
\r
' <select id="degreeOstentatoire">' +
\r
' <option value="invisible">Nul</option>' +
\r
' <td>' +
\r
' <select id="degreeOstentatoire">' +
\r
' <option value="invisible">Nul</option>' +
\r
diff --git
a/styles/1/pageMinichat.css
b/styles/1/pageMinichat.css
index
e57166f
..
aeefec7
100755
(executable)
--- a/
styles/1/pageMinichat.css
+++ b/
styles/1/pageMinichat.css
@@
-299,8
+299,8
@@
}
#page.minichat div.message.ekMasterheavy .pseudo {
color: #fcd82f;
}
#page.minichat div.message.ekMasterheavy .pseudo {
color: #fcd82f;
- padding-
left: 14
px;
- background: transparent url(img/marque_ek.png) no-repeat scroll
lef
t center
+ padding-
right: 15
px;
+ background: transparent url(img/marque_ek.png) no-repeat scroll
righ
t center
}
#page.minichat div.message .pseudo .login {
}
#page.minichat div.message .pseudo .login {