Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 12:36:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed global room

Browse Source 
socket.io already puts everyone into a room named ''
This commit is contained in:
barisusakli
2014-09-05 22:11:21 -04:00
parent 8e86f4b787
commit 0dc780148a
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/ajaxify.js
View File

@@ -46,7 +46,7 @@ $(document).ready(function() {
ajaxify.go = function (url, callback, quiet) { ajaxify.go = function (url, callback, quiet) {
// "quiet": If set to true, will not call pushState // "quiet": If set to true, will not call pushState
app.enterRoom('global'); app.enterRoom('');
$(window).off('scroll'); $(window).off('scroll');

12
public/src/app.js
View File

@@ -45,12 +45,12 @@ var socket,
case 'admin': case 'admin':
room = 'admin'; room = 'admin';
break; break;
default: case 'home':
room = 'global'; room = 'home';
break; break;
} }
app.currentRoom = '';
app.enterRoom(room, true); app.enterRoom(room);
socket.emit('meta.reconnected'); socket.emit('meta.reconnected');
@@ -198,9 +198,9 @@ var socket,
}); });
}; };
app.enterRoom = function (room, force) { app.enterRoom = function (room) {
if (socket) { if (socket) {
if (app.currentRoom === room && !force) { if (app.currentRoom === room) {
return; return;
} }

4
src/socket.io/meta.js
View File

@@ -66,11 +66,13 @@ SocketMeta.rooms.enter = function(socket, data, callback) {
return callback(new Error('[[error:invalid-data]]')); return callback(new Error('[[error:invalid-data]]'));
} }
if (data.leave !== null) { if (data.leave) {
socket.leave(data.leave); socket.leave(data.leave);
} }
if (data.enter) {
socket.join(data.enter); socket.join(data.enter);
}
if (data.leave && data.leave !== data.enter && data.leave.indexOf('topic') !== -1) { if (data.leave && data.leave !== data.enter && data.leave.indexOf('topic') !== -1) {
module.parent.exports.updateRoomBrowsingText(data.leave); module.parent.exports.updateRoomBrowsingText(data.leave);