Remove view/output related data from member model

diff --git a/client/src/helpers/utils.js b/client/src/helpers/utils.js
index 5ccacb30758aefc682f355735d280a5dccd467c4..1779f6a231bcc2ff6be97b05e8077304943f21a1 100644 (file)
--- a/client/src/helpers/utils.js
+++ b/client/src/helpers/utils.js
@@ -531,11 +531,11 @@ function styleText(string_id, params) {
 
     style = formatToIrcMsg(_kiwi.app.text_theme[string_id]);
 
-    // Bring member info back to first level of params
+    // Expand a member mask into its individual parts (nick, ident, hostname)
     if (params['%M']) {
-        _.each(params['%M'], function(val, key) {
-            params[key] = val;
-        });
+        params['%N'] = params['%M'].nick;
+        params['%J'] = params['%M'].ident;
+        params['%H'] = params['%M'].hostname;
     }
 
     // Do the magic. Use the shorthand syntax to produce output.

diff --git a/client/src/models/channel.js b/client/src/models/channel.js
index 26f143360c16adbec2a6611bca6415456d362605..93746ad5647bbf3b59284583619ef3aeacea6aab 100644 (file)
--- a/client/src/models/channel.js
+++ b/client/src/models/channel.js
@@ -22,7 +22,7 @@ _kiwi.model.Channel = _kiwi.model.Panel.extend({
                 return;\r
             }\r
 \r
-            this.addMsg(' ', styleText('channel_join', {'%M': member.getMemberMask(), '%T': translateText('client_models_channel_join'), '%C': name}), 'action join', {time: options.kiwi.time});\r
+            this.addMsg(' ', styleText('channel_join', {'%M': member.getMaskParts(), '%T': translateText('client_models_channel_join'), '%C': name}), 'action join', {time: options.kiwi.time});\r
         }, this);\r
 \r
         members.bind("remove", function (member, members, options) {\r
@@ -30,20 +30,20 @@ _kiwi.model.Channel = _kiwi.model.Panel.extend({
             var msg = (options.kiwi.message) ? '(' + options.kiwi.message + ')' : '';\r
 \r
             if (options.kiwi.type === 'quit' && show_message) {\r
-                this.addMsg(' ', styleText('channel_quit', {'%M': member.getMemberMask(), '%T': translateText('client_models_channel_quit', [msg]), '%C': name}), 'action quit', {time: options.kiwi.time});\r
+                this.addMsg(' ', styleText('channel_quit', {'%M': member.getMaskParts(), '%T': translateText('client_models_channel_quit', [msg]), '%C': name}), 'action quit', {time: options.kiwi.time});\r
 \r
             } else if (options.kiwi.type === 'kick') {\r
 \r
                 if (!options.kiwi.current_user_kicked) {\r
                     //If user kicked someone, show the message regardless of settings.\r
                     if (show_message || options.kiwi.current_user_initiated) {\r
-                        this.addMsg(' ', styleText('channel_kicked', {'%M': member.getMemberMask(), '%T': translateText('client_models_channel_kicked', [options.kiwi.by, msg]), '%C': name}), 'action kick', {time: options.kiwi.time});\r
+                        this.addMsg(' ', styleText('channel_kicked', {'%M': member.getMaskParts(), '%T': translateText('client_models_channel_kicked', [options.kiwi.by, msg]), '%C': name}), 'action kick', {time: options.kiwi.time});\r
                     }\r
                 } else {\r
                     this.addMsg(' ', styleText('channel_selfkick', {'%T': translateText('client_models_channel_selfkick', [options.kiwi.by, msg]), '%C': name}), 'action kick', {time: options.kiwi.time});\r
                 }\r
             } else if (show_message) {\r
-                this.addMsg(' ', styleText('channel_part', {'%M': member.getMemberMask(), '%T': translateText('client_models_channel_part', [msg]), '%C': name}), 'action part', {time: options.kiwi.time});\r
+                this.addMsg(' ', styleText('channel_part', {'%M': member.getMaskParts(), '%T': translateText('client_models_channel_part', [msg]), '%C': name}), 'action part', {time: options.kiwi.time});\r
 \r
             }\r
         }, this);\r

diff --git a/client/src/models/member.js b/client/src/models/member.js
index 88a4f45c8515352d07ebc55934dbcbf98f7ec6cb..7d65cee3d99e8eb6351a5673c1ff1530771fa7a9 100644 (file)
--- a/client/src/models/member.js
+++ b/client/src/models/member.js
@@ -148,9 +148,12 @@ _kiwi.model.Member = Backbone.Model.extend({
 \r
         return display;\r
     },\r
-    getMemberMask: function () {\r
-        // Why to use %N and %H is quite clear here. %J is because %I is already for italic and %U for underlines. Better ideas ?\r
-        return {'%N': this.get('nick'), '%J': this.get("ident"), '%H': this.get("hostname")};\r
+    getMaskParts: function () {\r
+        return {\r
+            nick: this.get('nick') || '',\r
+            ident: this.get('ident') || '',\r
+            hostname: this.get('hostname') || ''\r
+        };\r
     },\r
     /**\r
      * With the modes set on the user, make note if we have some sort of op status\r