mirrors/webxoss-core
1
0
Fork 1
mirror of https://github.com/webxoss/webxoss-core.git synced 2025-01-31 09:49:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #50 from Deardrops/fix/rename-room

Browse source 
fix bugs of renaming room
This commit is contained in:
webxoss 2017-05-29 14:28:35 +08:00 • committed by GitHub
commit a3670d981a
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -2,4 +2,5 @@ node_modules
trash trash
.DS_Store .DS_Store
*.sublime-* *.sublime-*
yarn.lock yarn.lock
.vscode/

12
RoomManager.js
View file

@ -218,16 +218,26 @@ RoomManager.prototype.renameRoom = function (client,cfg) {
} }
var oldRoomName = client.room.name; var oldRoomName = client.room.name;
var newRoomName = cfg.roomName; var newRoomName = cfg.roomName;
if (newRoomName === oldRoomName) {
return;
}
if (!errMsg) { if (!errMsg) {
errMsg = this.checkRoomName(newRoomName); errMsg = this.checkRoomName(newRoomName);
} }
var room; var room;
if (!errMsg) {
if (newRoomName in this.roomMap) {
errMsg = 'ROOM_ALREADY_EXISTS';
client.room.update();
}
}
if (!errMsg) { if (!errMsg) {
room = this.roomMap[oldRoomName]; room = this.roomMap[oldRoomName];
if (!room) { if (!room) {
errMsg = 'ROOM_DOES_NOT_EXIST'; errMsg = 'ROOM_DOES_NOT_EXIST';
} else if (client.getPosition() !== 'host') { } else if (client.getPosition() !== 'host') {
errMsg = 'YOU_ARE_NOT_ROOM_HOST'; errMsg = 'YOU_ARE_NOT_ROOM_HOST';
client.room.update();
} }
} }
if (errMsg) { if (errMsg) {
@ -235,7 +245,7 @@ RoomManager.prototype.renameRoom = function (client,cfg) {
return; return;
} }
room.name = newRoomName; room.name = newRoomName; // update client.room.name
renameProperty(this.roomMap, oldRoomName, newRoomName); renameProperty(this.roomMap, oldRoomName, newRoomName);
room.update(); room.update();
this.updateRoomList(); this.updateRoomList();

2
webxoss-client

@ -1 +1 @@
Subproject commit 51a710f84c2931e55ca71009ad469468b5662863 Subproject commit 05f50588feefab6b79887bab0fd473a1063e22b4