diff options
| author | Chris Porter <slug@qwebirc.org> | 2010-04-24 00:56:36 (GMT) |
|---|---|---|
| committer | Chris Porter <slug@qwebirc.org> | 2010-04-24 00:56:36 (GMT) |
| commit | 09bf9a41f32b047a1636d553808cebe8941efaf1 (patch) | |
| tree | 4e3547fbf018cae974b83f72c6ab8f3c4e72a862 | |
| parent | 73129e0b954b01d1fd93eb4f4a27186ab5645cf5 (diff) | |
Fixes issue #128, seems I never implemented this!
| -rw-r--r-- | js/irc/commandparser.js | 3 | ||||
| -rw-r--r-- | js/irc/ircclient.js | 9 | ||||
| -rw-r--r-- | js/ui/panes/options.js | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/js/irc/commandparser.js b/js/irc/commandparser.js index 3ef19dc..cf9ed5c 100644 --- a/js/irc/commandparser.js +++ b/js/irc/commandparser.js @@ -22,7 +22,8 @@ qwebirc.irc.BaseCommandParser = new Class({ this.parentObject.newActiveLine("OUR" + type, extra); return; } else if(window.type == qwebirc.ui.WINDOW_CHANNEL) { - type = "CHAN" + type; + this.parentObject.newChanLine(target, "OURCHAN" + type, null, extra); + return; } else { type = "PRIV" + type; } diff --git a/js/irc/ircclient.js b/js/irc/ircclient.js index fff9ae7..0356d4f 100644 --- a/js/irc/ircclient.js +++ b/js/irc/ircclient.js @@ -41,11 +41,16 @@ qwebirc.irc.IRCClient = new Class({ if(!extra) extra = {}; - extra["n"] = user.hostToNick(); - extra["h"] = user.hostToHost(); + if($defined(user)) { + extra["n"] = user.hostToNick(); + extra["h"] = user.hostToHost(); + } extra["c"] = channel; extra["-"] = this.nickname; + if(!(this.ui.uiOptions.NICK_OV_STATUS)) + delete extra["@"]; + this.newLine(channel, type, extra); }, newServerLine: function(type, data) { diff --git a/js/ui/panes/options.js b/js/ui/panes/options.js index ea24470..251b01d 100644 --- a/js/ui/panes/options.js +++ b/js/ui/panes/options.js @@ -26,7 +26,7 @@ qwebirc.config.DEFAULT_OPTIONS = [ }], [2, "DEDICATED_MSG_WINDOW", "Send privmsgs to dedicated messages window", false], [4, "DEDICATED_NOTICE_WINDOW", "Send notices to dedicated message window", false], - [3, "NICK_OV_STATUS", "Show status (@/+) before nicknames in nicklist", true], + [3, "NICK_OV_STATUS", "Show status (@/+) before nicknames in channel lines", true], [5, "ACCEPT_SERVICE_INVITES", "Automatically join channels when invited by Q", true], [6, "USE_HIDDENHOST", "Hide your hostmask when authed to Q (+x)", true], [8, "LASTPOS_LINE", "Show a last position indicator for each window", true, { |