Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 419230 - /msg and /describe messages not sent to current channel/user look as if they were.

Browse Source 
p=glenjamin+bmo@gmail.com
r=gijskruitbosch+bugs@gmail.com (Gijs Kruitbosch)
a=NPOTB


git-svn-id: svn://10.0.0.236/trunk@252020 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
gijskruitbosch%gmail.com 2008-05-31 14:59:22 +00:00
parent 2b20ec833e
commit a0a6390009
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mozilla/extensions/irc/xul/content/output-base.css
View File

@ -582,17 +582,6 @@ a.chatzilla-link:hover {
content: "]";
}
/* private messages *not* in a query window */
.msg[dest-type="IRCUser"] .msg-user:before {
content: "to(";
}
.msg[dest-type="IRCUser"][msg-dest$="ME!"] .msg-user:before {
content: "from(";
}
.msg[dest-type="IRCUser"] .msg-user:after {
content: ")";
}
/* private messages in a query window */
.msg[view-type="IRCUser"] .msg-user:before {
content: "{";
@ -606,3 +595,15 @@ a.chatzilla-link:hover {
.msg[view-type="IRCUser"][msg-dest$="ME!"] .msg-user:after {
content: "}";
}
/* messages 'to' or 'from' somewhere other than where displayed */
.msg[to-other] .msg-user:before {
content: "to(";
}
.msg[from-other] .msg-user:before {
content: "from(";
}
.msg[to-other] .msg-user:after,
.msg[from-other] .msg-user:after {
content: ")";
}

12
mozilla/extensions/irc/xul/content/static.js
View File

@ -4104,6 +4104,10 @@ function __display(message, msgtype, sourceObj, destObj)
// Also do "ME!" work for the dest.
if (destObj && destObj == me)
toAttr = me.unicodeName + " ME!";
// Is the message 'to' or 'from' somewhere other than this view
var toOther = ((sourceObj == me) && destObj && (destObj != this));
var fromOther = (toUser && (destObj == me) && (sourceObj != this));
/* isImportant means to style the messages as important, and flash the
* window, getAttention means just flash the window. */
@ -4155,6 +4159,10 @@ function __display(message, msgtype, sourceObj, destObj)
else
msgRow.setAttribute("msg-source", fromAttr);
}
if (toOther)
msgRow.setAttribute("to-other", toOther);
if (fromOther)
msgRow.setAttribute("from-other", fromOther);
// Timestamp cell.
var msgRowTimestamp = document.createElementNS(XHTML_NS, "html:td");
@ -4218,8 +4226,8 @@ function __display(message, msgtype, sourceObj, destObj)
}
else
{
// Messages from us, on a channel or network view, to a user
if (toUser && (this.TYPE != "IRCUser"))
// Messages from us, to somewhere other than this view
if (toOther)
{
nick = destObj.unicodeName;
decorSt = ">";