Commit 5b59f0d6 by Takatoshi Miura

Merge branch 'origin/bugfix_chatroom' into 'release_sp3'

Origin/bugfix chatroom

See merge request !66
parents 4970ca85 67366ff4
jQuery('#homeButton').on('click', function() { jQuery('#homeButton').on('click', function() {
if (CHAT_UTIL.isIOS()) { if (CHAT_UTIL.isIOS()) {
//TODO IOS処理追加必要。 webkit.messageHandlers.goHome.postMessage({});
} else if (CHAT_UTIL.isAndroid()) { } else if (CHAT_UTIL.isAndroid()) {
android.goHome(); android.goHome();
} }
......
...@@ -15,7 +15,7 @@ $('#roomNameChangeBtn').click(function() { ...@@ -15,7 +15,7 @@ $('#roomNameChangeBtn').click(function() {
//TODO validation //TODO validation
var changeRoomName = $('#roomNameInput').val(); var changeRoomName = $('#roomNameInput').val();
if (CHAT_UTIL.isIOS()) { if (CHAT_UTIL.isIOS()) {
//TODO webkit.messageHandlers.changeRoomName.postMessage(changeRoomName);
} else if (CHAT_UTIL.isAndroid()) { } else if (CHAT_UTIL.isAndroid()) {
android.changeRoomName(changeRoomName); android.changeRoomName(changeRoomName);
} }
......
...@@ -1730,7 +1730,10 @@ CHAT_UI.refreshArchiveDetailScreen = function(archiveId) { ...@@ -1730,7 +1730,10 @@ CHAT_UI.refreshArchiveDetailScreen = function(archiveId) {
// 参加ユーザ情報を表示 // 参加ユーザ情報を表示
let attendUserList = archive.attendUserIds; let attendUserList = archive.attendUserIds;
attendUserList = JSON.parse(archive.attendUserIds); if (typeof(android) != "undefined") {
// ios実装不要
attendUserList = JSON.parse(archive.attendUserIds);
}
attendUserList.forEach(function(user) { attendUserList.forEach(function(user) {
......
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