Actions/joins/parts messages tidy up

diff --git a/client_backbone/dev/model_application.js b/client_backbone/dev/model_application.js
index 6028a4fa24ec85272329c023b6cfee10361cdef9..fd6958d8406f079cea341abf9ebebc402529d223 100755 (executable)
--- 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]);\r
                                 }\r
                                 members.sort();\r
-                                //channel.addMsg('', '=== ' + event.nick + ' set mode ' + event.modes[i].mode + ' ' + event.modes[i].param, 'action mode');\r
+                                //channel.addMsg('', '== ' + event.nick + ' set mode ' + event.modes[i].mode + ' ' + event.modes[i].param, 'action mode');\r
                             }\r
                         } else {\r
                             // Channel mode being set\r
@@ -481,11 +481,11 @@ kiwi.model.Application = function () {
                         }\r
                     }\r
 \r
-                    channel.addMsg('', '=== ' + event.nick + ' sets mode ' + friendlyModeString(), 'action mode');\r
+                    channel.addMsg('', '== ' + event.nick + ' sets mode ' + friendlyModeString(), 'action mode');\r
                 } else {\r
                     // This is probably a mode being set on us.\r
                     if (event.target.toLowerCase() === kiwi.gateway.get("nick").toLowerCase()) {\r
-                        that.panels.server.addMsg('', '=== ' + event.nick + ' set mode ' + friendlyModeString(), 'action mode');\r
+                        that.panels.server.addMsg('', '== ' + event.nick + ' set mode ' + friendlyModeString(), 'action mode');\r
                     } else {\r
                        console.log('MODE command recieved for unknown target %s: ', event.target, event);\r
                     }\r
@@ -581,35 +581,35 @@ kiwi.model.Application = function () {
 \r
                 switch (data.error) {\r
                 case 'banned_from_channel':\r
-                    panel.addMsg(' ', '=== You are banned from ' + data.channel + '. ' + data.reason, 'status');\r
+                    panel.addMsg(' ', '== You are banned from ' + data.channel + '. ' + data.reason, 'status');\r
                     kiwi.app.message.text('You are banned from ' + data.channel + '. ' + data.reason);\r
                     break;\r
                 case 'bad_channel_key':\r
-                    panel.addMsg(' ', '=== Bad channel key for ' + data.channel, 'status');\r
+                    panel.addMsg(' ', '== Bad channel key for ' + data.channel, 'status');\r
                     kiwi.app.message.text('Bad channel key or password for ' + data.channel);\r
                     break;\r
                 case 'invite_only_channel':\r
-                    panel.addMsg(' ', '=== ' + data.channel + ' is invite only.', 'status');\r
+                    panel.addMsg(' ', '== ' + data.channel + ' is invite only.', 'status');\r
                     kiwi.app.message.text(data.channel + ' is invite only');\r
                     break;\r
                 case 'channel_is_full':\r
-                    panel.addMsg(' ', '=== ' + data.channel + ' is full.', 'status');\r
+                    panel.addMsg(' ', '== ' + data.channel + ' is full.', 'status');\r
                     kiwi.app.message.text(data.channel + ' is full');\r
                     break;\r
                 case 'chanop_privs_needed':\r
-                    panel.addMsg(' ', '=== ' + data.reason, 'status');\r
+                    panel.addMsg(' ', '== ' + data.reason, 'status');\r
                     kiwi.app.message.text(data.reason + ' (' + data.channel + ')');\r
                     break;\r
                 case 'no_such_nick':\r
                     tmp = kiwi.app.panels.getByName(data.nick);\r
                     if (tmp) {\r
-                        tmp.addMsg(' ', '=== ' + data.nick + ': ' + data.reason, 'status');\r
+                        tmp.addMsg(' ', '== ' + data.nick + ': ' + data.reason, 'status');\r
                     } else {\r
-                        kiwi.app.panels.server.addMsg(' ', '=== ' + data.nick + ': ' + data.reason, 'status');\r
+                        kiwi.app.panels.server.addMsg(' ', '== ' + data.nick + ': ' + data.reason, 'status');\r
                     }\r
                     break;\r
                 case 'nickname_in_use':\r
-                    kiwi.app.panels.server.addMsg(' ', '=== The nickname ' + data.nick + ' is already in use. Please select a new nickname', 'status');\r
+                    kiwi.app.panels.server.addMsg(' ', '== The nickname ' + data.nick + ' is already in use. Please select a new nickname', 'status');\r
                     if (kiwi.app.panels.server !== kiwi.app.panels.active) {\r
                         kiwi.app.message.text('The nickname "' + data.nick + '" is already in use. Please select a new nickname');\r
                     }\r
@@ -622,7 +622,7 @@ kiwi.model.Application = function () {
                     break;\r
                 default:\r
                     // We don't know what data contains, so don't do anything with it.\r
-                    //kiwi.front.tabviews.server.addMsg(null, ' ', '=== ' + data, 'status');\r
+                    //kiwi.front.tabviews.server.addMsg(null, ' ', '== ' + data, 'status');\r
                 }\r
             });\r
         };\r

diff --git a/client_backbone/dev/model_channel.js b/client_backbone/dev/model_channel.js
index 310e13c6d599c6e4bdb84e75c68af7eeb72a9584..9819bb9da760b38968160764a41cdd0fbfbd19bc 100755 (executable)
--- 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({
 \r
         members = this.get("members");\r
         members.bind("add", function (member) {\r
-            this.addMsg(' ', '--> ' + member.displayNick(true) + ' has joined', 'action join');\r
+            this.addMsg(' ', '== ' + member.displayNick(true) + ' has joined', 'action join');\r
         }, this);\r
 \r
         members.bind("remove", function (member, members, options) {\r
             var msg = (options.message) ? '(' + options.message + ')' : '';\r
 \r
             if (options.type === 'quit') {\r
-                this.addMsg(' ', '<-- ' + member.displayNick(true) + ' has quit ' + msg, 'action quit');\r
+                this.addMsg(' ', '== ' + member.displayNick(true) + ' has quit ' + msg, 'action quit');\r
             } else if(options.type === 'kick') {\r
-                this.addMsg(' ', '<-- ' + member.displayNick(true) + ' was kicked by ' + options.by + ' ' + msg, 'action kick');\r
+                this.addMsg(' ', '== ' + member.displayNick(true) + ' was kicked by ' + options.by + ' ' + msg, 'action kick');\r
             } else {\r
-                this.addMsg(' ', '<-- ' + member.displayNick(true) + ' has left ' + msg, 'action part');\r
+                this.addMsg(' ', '== ' + member.displayNick(true) + ' has left ' + msg, 'action part');\r
             }\r
         }, this);\r
     }\r

diff --git a/client_backbone/dev/view.js b/client_backbone/dev/view.js
index 8307ff799c17e5262e5ccb11953842a5fda87fad..717d9bf530c091786034de2fccd87e4cfe033edc 100755 (executable)
--- 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");\r
         }\r
         \r
-        this.model.addMsg('', '=== Topic for ' + this.model.get('name') + ' is: ' + topic, 'topic');\r
+        this.model.addMsg('', '== Topic for ' + this.model.get('name') + ' is: ' + topic, 'topic');\r
 \r
         // If this is the active channel then update the topic bar\r
         if (kiwi.app.panels.active === this) {\r