Merge branch 'WX15' into WX16

This commit is contained in:
WEBXOSS 2017-05-29 14:40:07 +08:00
commit 744efe2b2e
6 changed files with 18 additions and 12 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

4
Localize.min.js vendored

File diff suppressed because one or more lines are too long

View file

@ -859,17 +859,23 @@ $('link-edit-deck').onclick = function (event) {
return false;
};
$('room-name-form').onsubmit = function (event) {
var roomName = $('room-name').value;
if (roomName) {
/* 重命名房间名 */
var oldRoomName = '';
function handleRenameRoom (event) {
var name = $('room-name').value;
if (name && name !== oldRoomName ) {
socket.emit('renameRoom', {
'roomName': roomName
'roomName': name
});
oldRoomName = name;
}
event.preventDefault();
return false;
}
$('room-name').onblur = handleRenameRoom
$('room-name-form').onsubmit = handleRenameRoom
/* 直播 */
var stopFetchingLive = 0;
var watchingLive = false;

File diff suppressed because one or more lines are too long