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
f84cf88a
Commit
f84cf88a
authored
May 16, 2021
by
Takatoshi Miura
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'origin/#605_namecard_group_path' into 'develop'
[iOS] チャットルームのネームカードからグループに遷移する処理を実装 See merge request
!125
parents
29cc7d91
11e84410
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
3 deletions
+20
-3
public_new/contact.html
+8
-2
public_new/js/chat-db.js
+7
-0
public_new/js/chat-ui.js
+5
-1
No files found.
public_new/contact.html
View file @
f84cf88a
...
@@ -221,10 +221,16 @@
...
@@ -221,10 +221,16 @@
let
groupId
;
let
groupId
;
if
(
typeof
(
android
)
!=
"undefined"
)
{
if
(
typeof
(
android
)
!=
"undefined"
)
{
groupId
=
android
.
getToMoveGroupId
();
groupId
=
android
.
getToMoveGroupId
();
}
else
{
groupId
=
CHAT_DB
.
getToMoveGroupId
();
}
}
if
(
groupId
!=
""
&&
groupId
!=
undefined
)
{
if
(
groupId
!=
""
&&
groupId
!=
undefined
)
{
CHAT_UI
.
refreshAllGroupSearch
(
groupId
);
CHAT_UI
.
refreshAllGroupSearch
(
groupId
);
android
.
setToMoveGroupId
(
""
);
if
(
typeof
(
android
)
!=
"undefined"
)
{
android
.
setToMoveGroupId
(
""
);
}
else
{
webkit
.
messageHandlers
.
setToMoveGroupId
.
postMessage
(
""
);
}
}
else
{
}
else
{
CHAT_UI
.
refreshContactScreen
();
CHAT_UI
.
refreshContactScreen
();
}
}
...
...
public_new/js/chat-db.js
View file @
f84cf88a
...
@@ -351,3 +351,10 @@ CHAT_DB.createContentView = function() {
...
@@ -351,3 +351,10 @@ CHAT_DB.createContentView = function() {
return
callNativeApp
(
"createContentView"
,
{});
return
callNativeApp
(
"createContentView"
,
{});
}
}
};
};
CHAT_DB
.
getToMoveGroupId
=
function
()
{
// Androidは実装不要
if
(
CHAT_UTIL
.
isIOS
())
{
return
callNativeApp
(
"getToMoveGroupId"
,
{});
}
};
public_new/js/chat-ui.js
View file @
f84cf88a
...
@@ -1526,7 +1526,11 @@ CHAT_UI.refreshAllGroupSearch = function(paramGroupId) {
...
@@ -1526,7 +1526,11 @@ CHAT_UI.refreshAllGroupSearch = function(paramGroupId) {
var
groupId
=
paramGroupId
;
var
groupId
=
paramGroupId
;
if
(
window
.
location
.
pathname
.
includes
(
"chat_room"
))
{
if
(
window
.
location
.
pathname
.
includes
(
"chat_room"
))
{
if
(
groupId
==
""
)
return
;
if
(
groupId
==
""
)
return
;
android
.
setToMoveGroupId
(
groupId
);
if
(
typeof
(
android
)
!=
"undefined"
)
{
android
.
setToMoveGroupId
(
groupId
);
}
else
{
webkit
.
messageHandlers
.
setToMoveGroupId
.
postMessage
(
groupId
);
}
window
.
location
.
href
=
"contact.html"
;
window
.
location
.
href
=
"contact.html"
;
}
}
...
...
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