Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-20 23:40:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

dont change height if sizing horizontally #1508

Browse Source
This commit is contained in:
barisusakli
2014-05-09 11:41:41 -04:00
parent c2fb4700de
commit d304bab4f1
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/src/modules/chat.js
View File

@@ -172,6 +172,9 @@ define(['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) {
}); });
chatModal.find('.modal-content').on('resize', function(event, ui) { 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 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 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); var contentMargin = parseInt(chatModal.find('#chat-content').css('margin-top'), 10) + parseInt(chatModal.find('#chat-content').css('margin-bottom'), 10);

6
src/socket.io/index.js
View File

@@ -197,8 +197,12 @@ Sockets.in = function(room) {
}; };
Sockets.getConnectedClients = function() { Sockets.getConnectedClients = function() {
var clients = io.sockets.clients();
var uids = []; var uids = [];
if (!io) {
return uids;
}
var clients = io.sockets.clients();
clients.forEach(function(client) { clients.forEach(function(client) {
if(client.uid && uids.indexOf(client.uid) === -1) { if(client.uid && uids.indexOf(client.uid) === -1) {
uids.push(client.uid); uids.push(client.uid);