Commit f06837a8 by Takatoshi Miura

ios協業機能を実装(FermiUI)

parent 6644d05e
......@@ -217,8 +217,11 @@
PLATFORM = platform;
IS_MOBILE = isMobile;
IS_ONLINE = isOnline;
let groupId = android.getToMoveGroupId();
let groupId;
if (typeof(android) != "undefined") {
groupId = android.getToMoveGroupId();
}
if (groupId != "" && groupId != undefined) {
CHAT_UI.refreshAllGroupSearch(groupId);
android.setToMoveGroupId("");
......
......@@ -325,7 +325,7 @@ CHAT_DB.getContentList = function() {
CHAT_DB.getUserListByLoginId = function(loginIdList) {
console.log(loginIdList);
if (CHAT_UTIL.isIOS()) {
//TODO ローカルDBからダウンロード済のコンテンツを取得
return JSON.parse(callNativeApp("getUserListByLoginId", {"loginIdList": loginIdList.join(",")}));
} else if (CHAT_UTIL.isAndroid()) {
return JSON.parse(android.getUserListByLoginId(loginIdList.join(",")));
}
......
......@@ -1306,7 +1306,7 @@ CHAT_UI.loadMessages = function(roomId, roomName) {
var collaborationInfo;
var userInCollaboration;
if (CHAT_UTIL.isIOS()) {
collaborationInfo = message.message;
collaborationInfo = JSON.parse(message.message);
userInCollaboration = JSON.parse(CHAT_DB.getUserInfoList(collaborationInfo.userList));
} else if (CHAT_UTIL.isAndroid()) {
collaborationInfo = JSON.parse(message.message);
......@@ -1349,15 +1349,6 @@ CHAT_UI.loadMessages = function(roomId, roomName) {
})
// メッセージの画面描画
jQueryMessages.prepend(workVal);
// iOSは協業ボタンを非活性化
if (CHAT_UTIL.isIOS()) {
$('.footer_content_b a').css('pointer-events', 'none');
$('.footer_content_b .footer_item').on('click', function() {
alert('選択した機能は現在ご利用になれません。');
});
}
CHAT_UI.waitForLoadingImage(jQueryMessages, CHAT_UI.scrollToBottom);
CHAT_UI.waitForLoadingVideo(jQueryMessages, CHAT_UI.scrollToBottom);
// ユーザ削除ボタン表示しない
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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