From ad685a01473994e1d185abe00693bd40742ced2b Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 14 Sep 2015 13:19:21 -0400
Subject: [PATCH] fix function in loops
---
public/src/modules/chat.js | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index 2d364b0f8f..7555a380e5 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -152,8 +152,7 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra
return;
}
- for(var x = 0; x<chats.length; ++x) {
- userObj = chats[x];
+ chats.forEach(function(userObj) {
dropdownEl = $('<li class="' + (userObj.unread ? 'unread' : '') + '"/>')
.attr('data-uid', userObj.uid)
.html('<a data-ajaxify="false">'+
@@ -162,16 +161,15 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra
userObj.username + '</a>')
.appendTo(chatsListEl);
- (function(userObj) {
- dropdownEl.click(function() {
- if (!ajaxify.currentPage.match(/^chats\//)) {
- app.openChat(userObj.username, userObj.uid);
- } else {
- ajaxify.go('chats/' + utils.slugify(userObj.username));
- }
- });
- })(userObj);
- }
+
+ dropdownEl.click(function() {
+ if (!ajaxify.currentPage.match(/^chats\//)) {
+ app.openChat(userObj.username, userObj.uid);
+ } else {
+ ajaxify.go('chats/' + utils.slugify(userObj.username));
+ }
+ });
+ });
});
};
@@ -490,8 +488,11 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra
module.sync = function() {
socket.emit('modules.chats.sync', function(err, users) {
- for(var x=0,numUsers=users.length,user;x<numUsers;x++) {
- user = users[x];
+ if (err) {
+ return app.alertError(err.message);
+ }
+
+ users.forEach(function(user) {
if (!module.modalExists(user.uid)) {
module.createModal({
username: user.username,
@@ -503,7 +504,7 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra
}
});
}
- }
+ });
});
};