From: Darren Date: Mon, 8 Oct 2012 09:43:07 +0000 (+0100) Subject: Actions/joins/parts messages tidy up X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=aadaa4e1490acf2d7fa67edfa4df47de24dec978;p=KiwiIRC.git Actions/joins/parts messages tidy up --- diff --git a/client_backbone/dev/model_application.js b/client_backbone/dev/model_application.js index 6028a4f..fd6958d 100755 --- a/client_backbone/dev/model_application.js +++ b/client_backbone/dev/model_application.js @@ -472,7 +472,7 @@ kiwi.model.Application = function () { member.removeMode(event.modes[i].mode[1]); } members.sort(); - //channel.addMsg('', '=== ' + event.nick + ' set mode ' + event.modes[i].mode + ' ' + event.modes[i].param, 'action mode'); + //channel.addMsg('', '== ' + event.nick + ' set mode ' + event.modes[i].mode + ' ' + event.modes[i].param, 'action mode'); } } else { // Channel mode being set @@ -481,11 +481,11 @@ kiwi.model.Application = function () { } } - channel.addMsg('', '=== ' + event.nick + ' sets mode ' + friendlyModeString(), 'action mode'); + channel.addMsg('', '== ' + event.nick + ' sets mode ' + friendlyModeString(), 'action mode'); } else { // This is probably a mode being set on us. if (event.target.toLowerCase() === kiwi.gateway.get("nick").toLowerCase()) { - that.panels.server.addMsg('', '=== ' + event.nick + ' set mode ' + friendlyModeString(), 'action mode'); + that.panels.server.addMsg('', '== ' + event.nick + ' set mode ' + friendlyModeString(), 'action mode'); } else { console.log('MODE command recieved for unknown target %s: ', event.target, event); } @@ -581,35 +581,35 @@ kiwi.model.Application = function () { switch (data.error) { case 'banned_from_channel': - panel.addMsg(' ', '=== You are banned from ' + data.channel + '. ' + data.reason, 'status'); + panel.addMsg(' ', '== You are banned from ' + data.channel + '. ' + data.reason, 'status'); kiwi.app.message.text('You are banned from ' + data.channel + '. ' + data.reason); break; case 'bad_channel_key': - panel.addMsg(' ', '=== Bad channel key for ' + data.channel, 'status'); + panel.addMsg(' ', '== Bad channel key for ' + data.channel, 'status'); kiwi.app.message.text('Bad channel key or password for ' + data.channel); break; case 'invite_only_channel': - panel.addMsg(' ', '=== ' + data.channel + ' is invite only.', 'status'); + panel.addMsg(' ', '== ' + data.channel + ' is invite only.', 'status'); kiwi.app.message.text(data.channel + ' is invite only'); break; case 'channel_is_full': - panel.addMsg(' ', '=== ' + data.channel + ' is full.', 'status'); + panel.addMsg(' ', '== ' + data.channel + ' is full.', 'status'); kiwi.app.message.text(data.channel + ' is full'); break; case 'chanop_privs_needed': - panel.addMsg(' ', '=== ' + data.reason, 'status'); + panel.addMsg(' ', '== ' + data.reason, 'status'); kiwi.app.message.text(data.reason + ' (' + data.channel + ')'); break; case 'no_such_nick': tmp = kiwi.app.panels.getByName(data.nick); if (tmp) { - tmp.addMsg(' ', '=== ' + data.nick + ': ' + data.reason, 'status'); + tmp.addMsg(' ', '== ' + data.nick + ': ' + data.reason, 'status'); } else { - kiwi.app.panels.server.addMsg(' ', '=== ' + data.nick + ': ' + data.reason, 'status'); + kiwi.app.panels.server.addMsg(' ', '== ' + data.nick + ': ' + data.reason, 'status'); } break; case 'nickname_in_use': - kiwi.app.panels.server.addMsg(' ', '=== The nickname ' + data.nick + ' is already in use. Please select a new nickname', 'status'); + kiwi.app.panels.server.addMsg(' ', '== The nickname ' + data.nick + ' is already in use. Please select a new nickname', 'status'); if (kiwi.app.panels.server !== kiwi.app.panels.active) { kiwi.app.message.text('The nickname "' + data.nick + '" is already in use. Please select a new nickname'); } @@ -622,7 +622,7 @@ kiwi.model.Application = function () { break; default: // We don't know what data contains, so don't do anything with it. - //kiwi.front.tabviews.server.addMsg(null, ' ', '=== ' + data, 'status'); + //kiwi.front.tabviews.server.addMsg(null, ' ', '== ' + data, 'status'); } }); }; diff --git a/client_backbone/dev/model_channel.js b/client_backbone/dev/model_channel.js index 310e13c..9819bb9 100755 --- a/client_backbone/dev/model_channel.js +++ b/client_backbone/dev/model_channel.js @@ -15,18 +15,18 @@ kiwi.model.Channel = kiwi.model.Panel.extend({ members = this.get("members"); members.bind("add", function (member) { - this.addMsg(' ', '--> ' + member.displayNick(true) + ' has joined', 'action join'); + this.addMsg(' ', '== ' + member.displayNick(true) + ' has joined', 'action join'); }, this); members.bind("remove", function (member, members, options) { var msg = (options.message) ? '(' + options.message + ')' : ''; if (options.type === 'quit') { - this.addMsg(' ', '<-- ' + member.displayNick(true) + ' has quit ' + msg, 'action quit'); + this.addMsg(' ', '== ' + member.displayNick(true) + ' has quit ' + msg, 'action quit'); } else if(options.type === 'kick') { - this.addMsg(' ', '<-- ' + member.displayNick(true) + ' was kicked by ' + options.by + ' ' + msg, 'action kick'); + this.addMsg(' ', '== ' + member.displayNick(true) + ' was kicked by ' + options.by + ' ' + msg, 'action kick'); } else { - this.addMsg(' ', '<-- ' + member.displayNick(true) + ' has left ' + msg, 'action part'); + this.addMsg(' ', '== ' + member.displayNick(true) + ' has left ' + msg, 'action part'); } }, this); } diff --git a/client_backbone/dev/view.js b/client_backbone/dev/view.js index 8307ff7..717d9bf 100755 --- a/client_backbone/dev/view.js +++ b/client_backbone/dev/view.js @@ -431,7 +431,7 @@ kiwi.view.Channel = kiwi.view.Panel.extend({ topic = this.model.get("topic"); } - this.model.addMsg('', '=== Topic for ' + this.model.get('name') + ' is: ' + topic, 'topic'); + this.model.addMsg('', '== Topic for ' + this.model.get('name') + ' is: ' + topic, 'topic'); // If this is the active channel then update the topic bar if (kiwi.app.panels.active === this) {