Fixing code style

diff --git a/client/assets/src/models/channel.js b/client/assets/src/models/channel.js
index cc9c99f6e65c4a2debf306a2d1e3177639e728a3..8a68d85f7edb423274c788a9f17228e24507ce3e 100644 (file)
--- a/client/assets/src/models/channel.js
+++ b/client/assets/src/models/channel.js
@@ -27,27 +27,19 @@ _kiwi.model.Channel = _kiwi.model.Panel.extend({
 \r
         members.bind("remove", function (member, members, options) {\r
             var show_message = _kiwi.global.settings.get('show_joins_parts');\r
-\r
-\r
             var msg = (options.message) ? '(' + options.message + ')' : '';\r
 \r
             if (options.type === 'quit' && show_message) {\r
-                \r
               this.addMsg(' ', '== ' + member.displayNick(true) + ' has quit ' + msg, 'action quit');\r
-\r
             } else if(options.type === 'kick') {\r
-               \r
-              if (!options.kicked) {\r
-              \r
-                if (show_message || options.kicker) { \r
-                  this.addMsg(' ', '== ' + member.displayNick(true) + ' was kicked by ' + options.by + ' ' + msg, 'action kick');\r
-                \r
+                if (!options.current_user_kicked) {\r
+                    //If user kicked someone, show the message regardless of settings.\r
+                    if (show_message || options.current_user_initiated) { \r
+                      this.addMsg(' ', '== ' + member.displayNick(true) + ' was kicked by ' + options.by + ' ' + msg, 'action kick');\r
+                    }\r
+                } else {\r
+                    this.addMsg(' ', '== You have been kicked by ' + options.by + ' '+msg, 'action kick');\r
                 }\r
-                \r
-              } else {\r
-                this.addMsg(' ', '=== You have been kicked by ' + options.by + ' '+msg, 'action kick');\r
-              }\r
-            \r
             } else if (show_message) {\r
                 this.addMsg(' ', '== ' + member.displayNick(true) + ' has left ' + msg, 'action part');\r
             }\r

diff --git a/client/assets/src/models/network.js b/client/assets/src/models/network.js
index a2330f8a75b4661fd8558c52003a68228380c9df..89803dc518263a079e96769d0ade71d452041598 100644 (file)
--- a/client/assets/src/models/network.js
+++ b/client/assets/src/models/network.js
@@ -279,8 +279,8 @@
         part_options.type = 'kick';
         part_options.by = event.nick;
         part_options.message = event.message || '';
-        part_options.kicked = (event.kicked == this.get('nick'))
-        part_options.kicker = (event.nick == this.get('nick'))
+        part_options.current_user_kicked = (event.kicked == this.get('nick'))
+        part_options.current_user_initiated = (event.nick == this.get('nick'))
 
         channel = this.panels.getByName(event.channel);
         if (!channel) return;
@@ -294,7 +294,7 @@
 
         members.remove(user, part_options);
 
-        if (part_options.kicked) {
+        if (part_options.current_user_kicked) {
             members.reset([]);        
         }
     }