From d304bab4f1b03565b78b751a50bf18a58e14cc1b Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 9 May 2014 11:41:41 -0400 Subject: [PATCH] dont change height if sizing horizontally #1508 --- public/src/modules/chat.js | 3 +++ src/socket.io/index.js | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index 21588fbe4b..53fdba680b 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -172,6 +172,9 @@ define(['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) { }); chatModal.find('.modal-content').on('resize', function(event, ui) { + if (ui.originalSize.height === ui.size.height) { + return; + } var totalHeight = chatModal.find('.modal-content').outerHeight() - chatModal.find('.modal-header').outerHeight(); var padding = parseInt(chatModal.find('.modal-body').css('padding-top'), 10) + parseInt(chatModal.find('.modal-body').css('padding-bottom'), 10); var contentMargin = parseInt(chatModal.find('#chat-content').css('margin-top'), 10) + parseInt(chatModal.find('#chat-content').css('margin-bottom'), 10); diff --git a/src/socket.io/index.js b/src/socket.io/index.js index 11c09936e9..1de64d2a32 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -197,8 +197,12 @@ Sockets.in = function(room) { }; Sockets.getConnectedClients = function() { - var clients = io.sockets.clients(); var uids = []; + if (!io) { + return uids; + } + var clients = io.sockets.clients(); + clients.forEach(function(client) { if(client.uid && uids.indexOf(client.uid) === -1) { uids.push(client.uid);