Clean up style of if statements and for loops.

Author: evanyeung

main.js

@@ -67,9 +67,11 @@ slack.init(function(data, ws) {
 
     data = JSON.parse(data);
     users = [];
-    for(var i = 0; i < data.members.length; i++) {
+    for (var i = 0; i < data.members.length; i++) {
       user = data.members[i];
-      if(!user.deleted && user.id != currentUser.id) users.push(user);
+      if (!user.deleted && user.id != currentUser.id) {
+        users.push(user);
+      }
     }
 
     components.userList.setItems(
@@ -94,9 +96,11 @@ slack.getChannels(function(error, response, data){
 
   data = JSON.parse(data);
   channels = [];
-  for(var i = 0; i < data.channels.length; i++) {
+  for (var i = 0; i < data.channels.length; i++) {
     var channel = data.channels[i];
-    if(!channel.is_archived) channels.push(channel);
+    if (!channel.is_archived) {
+      channels.push(channel);
+    }
   }
   components.channelList.setItems(
     channels.map(function(channel) {
@@ -120,15 +124,16 @@ var updateMessages = function(data, markFn) {
         username;
 
       // get the author
-      if(message.user === currentUser.id)
+      if (message.user === currentUser.id) {
         username = currentUser.name;
-      else
-        for(var i=0; i < len; i++) {
+      } else {
+        for (var i=0; i < len; i++) {
           if (message.user === users[i].id) {
             username = users[i].name;
             break;
           }
         }
+      }
 
       return {text: message.text, username: username};
     })
@@ -161,9 +166,9 @@ components.userList.on('select', function(data) {
 
   // get user's id
   var userId = '';
-  for(var i = 0; i < users.length; i++) {
+  for (var i = 0; i < users.length; i++) {
     user = users[i];
-    if(user.name === userName) {
+    if (user.name === userName) {
       userId = user.id;
       break;
     }
@@ -207,16 +212,15 @@ function handleSentConfirmation(message) {
   var lines = components.chatWindow.getLines(),
     keys = Object.keys(lines),
     line, i;
-  for(i=keys.length - 1; i >= 0; i--){
+  for (i=keys.length - 1; i >= 0; i--) {
     line = lines[keys[i]].split('(pending - ');
     if (parseInt(line.pop()[0]) === message.reply_to) {
 
       components.chatWindow.deleteLine(parseInt(keys[i]));
 
       if (message.ok) {
         components.chatWindow.insertLine(i, line.join(''));
-      }
-      else {
+      } else {
         components.chatWindow.insertLine(i, line.join('') + ' (FAILED)');
       }
       break;
@@ -227,15 +231,15 @@ function handleSentConfirmation(message) {
 }
 
 function handleNewMessage(message) {
-  if(message.channel !== currentChannelId) {
+  if (message.channel !== currentChannelId) {
     return;
   }
 
   var len = users.length,
     username;
 
   // get the author
-  for(var i=0; i < len; i++) {
+  for (var i=0; i < len; i++) {
     if (message.user === users[i].id) {
       username = users[i].name;
     }

slackClient.js

@@ -33,7 +33,9 @@ function slackRequest(endpoint, query, callback) {
         process.exit(1);
       }
 
-      if (callback) callback.apply(this, arguments);
+      if (callback) {
+        callback.apply(this, arguments);
+      }
     });
 }
 
@@ -47,56 +49,72 @@ module.exports = {
   },
   getChannels: function(callback) {
     slackRequest('channels.list', {}, function(error, response, data) {
-      if(callback) callback.apply(this, arguments);
+      if (callback) {
+        callback.apply(this, arguments);
+      }
     });
   },
   joinChannel: function(name, callback) {
     slackRequest('channels.join', {
       name: name
     }, function(error, response, data) {
-      if(callback) callback.apply(this, arguments);
+      if (callback) {
+        callback.apply(this, arguments);
+      }
     });
   },
   getChannelHistory: function(id, callback) {
     slackRequest('channels.history', {
       channel: id
     }, function(error, response, data) {
-      if(callback) callback.apply(this, arguments);
+      if (callback) {
+        callback.apply(this, arguments);
+      }
     });
   },
   markChannel: function(id, timestamp, callback) {
     slackRequest('channels.mark', {
-      channel: id, 
+      channel: id,
       ts: timestamp
     }, function(error, response, data) {
-      if(callback) callback.apply(this, arguments);
+      if (callback) {
+        callback.apply(this, arguments);
+      }
     });
   },
   getUsers: function(callback) {
     slackRequest('users.list', {}, function(error, response, data) {
-      if(callback) callback.apply(this, arguments);
+      if (callback) {
+        callback.apply(this, arguments);
+      }
     });
   },
   openIm: function(id, callback) {
     slackRequest('im.open', {
       user: id
     }, function(error, response, data) {
-      if(callback) callback.apply(this, arguments);
+      if (callback) {
+        callback.apply(this, arguments);
+      }
     });
   },
   getImHistory: function(id, callback) {
     slackRequest('im.history', {
       channel: id
     }, function(error, response, data) {
-      if(callback) callback.apply(this, arguments);
+      if (callback) {
+        callback.apply(this, arguments);
+      }
     });
   },
   markIm: function(id, timestamp, callback) {
     slackRequest('im.mark', {
-      channel: id, 
+      channel: id,
       ts: timestamp
     }, function(error, response, data) {
-      if(callback) callback.apply(this, arguments);
+      if (callback) {
+        callback.apply(this, arguments);
+      }
     });
   },
 };

userInterface.js

@@ -178,14 +178,14 @@ module.exports = {
     channelList.on('keypress', keyBindings);
     chatWindow.on('keypress', keyBindings);
     messageInput.on('keypress', function(ch, key){
-      if (    key.full === 'escape' ||
-        key.full === 'C-u'    ||
-        key.full === 'C-c'    ||
-        key.full === 'C-w'    ||
-        key.full === 'C-l'   ) {
-          messageInput.cancel();
-          keyBindings(ch, key);
-        }
+      if (key.full === 'escape' ||
+          key.full === 'C-u'    ||
+          key.full === 'C-c'    ||
+          key.full === 'C-w'    ||
+          key.full === 'C-l') {
+        messageInput.cancel();
+        keyBindings(ch, key);
+      }
     });
 
     // scrolling in chat window