Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
chat_webview
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abookCommunication
chat_webview
Commits
f06837a8
Commit
f06837a8
authored
Apr 30, 2021
by
Takatoshi Miura
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ios協業機能を実装(FermiUI)
parent
6644d05e
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
12 deletions
+6
-12
public_new/contact.html
+4
-1
public_new/js/chat-db.js
+1
-1
public_new/js/chat-ui.js
+1
-10
public_new/js/libs/socket.io.js.map
+0
-0
No files found.
public_new/contact.html
View file @
f06837a8
...
...
@@ -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
(
""
);
...
...
public_new/js/chat-db.js
View file @
f06837a8
...
...
@@ -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
(
","
)));
}
...
...
public_new/js/chat-ui.js
View file @
f06837a8
...
...
@@ -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
);
// ユーザ削除ボタン表示しない
...
...
public_new/js/libs/socket.io.js.map
0 → 100644
View file @
f06837a8
This source diff could not be displayed because it is too large. You can
view the blob
instead.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment