Commit fb771d1f by Lee Munkyeong

既存処理削除。

parent 38d84d35
...@@ -1136,15 +1136,11 @@ CHAT_UI.joinRoom = function(roomId,roomName) { ...@@ -1136,15 +1136,11 @@ CHAT_UI.joinRoom = function(roomId,roomName) {
CHAT_UI.loadMessages = function(roomId, roomName) { CHAT_UI.loadMessages = function(roomId, roomName) {
if (IS_ONLINE == 'true') { if (IS_ONLINE == 'true') {
CHAT_UI.refreshForOnline(); CHAT_UI.refreshForOnline();
CHAT_SOCKET.connectSocket();
if (typeof(android) != "undefined") { if (typeof(android) != "undefined") {
android.updateMessages(roomId); android.updateMessages(roomId);
} else { } else {
webkit.messageHandlers.updateMessages.postMessage({roomId}); webkit.messageHandlers.updateMessages.postMessage({roomId});
} }
socket.emit('exitRoom',roomId);
socket.emit('joinRoom', roomId, roomName, function() {
});
} else { } else {
CHAT_UI.refreshForOffline(); CHAT_UI.refreshForOffline();
} }
...@@ -1421,7 +1417,7 @@ CHAT_UI.refreshAllGroupSearch = function(paramGroupId) { ...@@ -1421,7 +1417,7 @@ CHAT_UI.refreshAllGroupSearch = function(paramGroupId) {
$('.overlay_src_msg').empty(); $('.overlay_src_msg').empty();
$('#contactSearch').attr('placeholder', getLocalizedString('searchUserAndGroup')); $('#contactSearch').attr('placeholder', getLocalizedString('searchUserAndGroup'));
$('#tabAllGroup').prop('checked', true); $('#tabAllGroup').prop('checked', true);
//オンライン状態であればサーバから情報更新。 //オンライン状態であればサーバから情報更新。
if (IS_ONLINE == 'true') { if (IS_ONLINE == 'true') {
if (typeof(android) != "undefined") { if (typeof(android) != "undefined") {
...@@ -1588,7 +1584,7 @@ CHAT_UI.refreshArchiveScreen = function() { ...@@ -1588,7 +1584,7 @@ CHAT_UI.refreshArchiveScreen = function() {
CHAT_UI.dismissLoadingIndicator(); CHAT_UI.dismissLoadingIndicator();
return; return;
} }
archiveList.forEach(function(archive) { archiveList.forEach(function(archive) {
var typeImage = ""; var typeImage = "";
switch(archive.archiveType) { switch(archive.archiveType) {
case 0: // 画像 case 0: // 画像
...@@ -1716,7 +1712,7 @@ CHAT_UI.refreshArchiveDetailScreen = function(archiveId) { ...@@ -1716,7 +1712,7 @@ CHAT_UI.refreshArchiveDetailScreen = function(archiveId) {
document.getElementById('joinChatRoom').onclick = function() { document.getElementById('joinChatRoom').onclick = function() {
CHAT_UI.joinRoom(archive.roomId, archive.roomName); CHAT_UI.joinRoom(archive.roomId, archive.roomName);
} }
// loadingIndicatorを非表示 // loadingIndicatorを非表示
CHAT_UI.dismissLoadingIndicator(); CHAT_UI.dismissLoadingIndicator();
}; };
...@@ -2143,21 +2139,6 @@ CHAT_UI.refreshMyGroupForAddUser = function() { ...@@ -2143,21 +2139,6 @@ CHAT_UI.refreshMyGroupForAddUser = function() {
let obj = jQuery.parseHTML(html); let obj = jQuery.parseHTML(html);
$('#favoriteListForMakeRoom').append(obj); $('#favoriteListForMakeRoom').append(obj);
/*favoriteUserList.forEach(function(favoriteUser) {
favoriteUser.profileImagePath = CHAT.getProfileImgUrl(favoriteUser.profileUrl)
let html = Mustache.render(userTemplate, {
shopMemberId: favoriteUser.shopMemberId,
profileImage: favoriteUser.profileImagePath,
name: favoriteUser.shopMemberName,
isFavorite: true
});
let obj = $(jQuery.parseHTML(html)).on('click', function() {
});
$('#favoriteList').append(obj);
})*/
var myGroupList = CHAT_DB.getMyGroupUsersNotInRoom(); var myGroupList = CHAT_DB.getMyGroupUsersNotInRoom();
myGroupList.forEach(function(myGroup) { myGroupList.forEach(function(myGroup) {
...@@ -2192,8 +2173,7 @@ CHAT_UI.refreshForOnline = function() { ...@@ -2192,8 +2173,7 @@ CHAT_UI.refreshForOnline = function() {
$('.fa-download').show(); $('.fa-download').show();
if (typeof $('#roomTitle').val() != 'undefined') { if (typeof $('#roomTitle').val() != 'undefined') {
CHAT_SOCKET.connectSocket(); CHAT_SOCKET.connectSocket();
socket.emit('exitRoom',CHAT.globalLoginParameter.roomId); socket.emit('join', CHAT.globalLoginParameter, function() {
socket.emit('joinRoom', CHAT.globalLoginParameter.roomId, CHAT.globalLoginParameter.roomName, function() {
}); });
} }
} }
......
...@@ -242,38 +242,7 @@ getLoginParameter = function(sid, loginId, shopName, roomId = undefined, roomNam ...@@ -242,38 +242,7 @@ getLoginParameter = function(sid, loginId, shopName, roomId = undefined, roomNam
languageCode = "en" languageCode = "en"
} }
CHAT_UI.htmlElementTextInitialize(languageCode) CHAT_UI.htmlElementTextInitialize(languageCode)
CHAT_UI.dismissLoadingIndicator();
if (IS_ONLINE == 'true') {
socket.emit('join', loginParam, function(err) {
if (err) {
// #36174
$("#customAlertTitle").text(err);
$("#customAlertOk").text(getLocalizedString("yesTitle"));
$('#customAlert').appendTo("body").modal({
backdrop: 'static',
keyboard: false
})
.on('click', '#customAlertOk', function(e) {
});
} else {
if (loginParam.roomName != undefined && loginParam.roomName != "null") {
$('.titleRoomName').text(loginParam.roomName).data('roomName', loginParam.roomName);
} else {
// 設定されていたroomNameがない場合
let roomListTitle = getLocalizedString("roomListTitle")
$('.titleRoomName').text(roomListTitle).data('roomName', roomListTitle);
}
}
// loadingIndicatorを表示しない
CHAT_UI.dismissLoadingIndicator();
});
} else {
// loadingIndicatorを表示しない
CHAT_UI.dismissLoadingIndicator();
}
} }
CHAT.leaveRoom = function() { CHAT.leaveRoom = function() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment