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
17b9e57b
Commit
17b9e57b
authored
Jul 26, 2021
by
Kim Peace
Committed by
onuma
Jul 26, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed parse bool and string
parent
ad2ba6d3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
24 deletions
+15
-24
public_new/js/common/native-bridge-datasource.js
+12
-21
public_new/js/common/native-bridge-delegate.js
+1
-1
public_new/modal_collabo_profile.html
+2
-2
No files found.
public_new/js/common/native-bridge-datasource.js
View file @
17b9e57b
...
...
@@ -15,6 +15,10 @@ function callNativeApp(iosKey, jsonData) {
return
result
;
}
function
parseBoolStringToBool
(
str
)
{
return
str
==
"true"
?
true
:
false
;
}
var
NativeBridgeDataSource
=
{};
NativeBridgeDataSource
.
removeFavoriteGroup
=
function
(
groupID
)
{
...
...
@@ -22,7 +26,7 @@ NativeBridgeDataSource.removeFavoriteGroup = function (groupID) {
const
result
=
callNativeApp
(
NATIVE_KEY_IOS
.
removeFavoriteGroup
,
{
groupId
:
groupID
,
});
return
result
==
"true"
?
true
:
false
;
return
parseBoolStringToBool
(
result
)
;
}
else
{
return
android
.
removeFavoriteGroup
(
groupID
);
}
...
...
@@ -35,11 +39,7 @@ NativeBridgeDataSource.addFavoriteGroup = function (groupID) {
const
result
=
callNativeApp
(
NATIVE_KEY_IOS
.
addFavoriteGroup
,
{
groupId
:
groupID
,
});
if
(
result
==
"true"
)
{
return
true
;
}
else
{
return
false
;
}
return
parseBoolStringToBool
(
result
);
}
};
...
...
@@ -352,14 +352,10 @@ NativeBridgeDataSource.getBeforeRoomType = function () {
NativeBridgeDataSource
.
removeFavoriteUser
=
function
(
shopMemberId
)
{
if
(
deviceInfo
.
isiOS
())
{
var
result
=
callNativeApp
(
NATIVE_KEY_IOS
.
removeFavoriteUser
,
{
const
result
=
callNativeApp
(
NATIVE_KEY_IOS
.
removeFavoriteUser
,
{
shopMemberId
:
shopMemberId
,
});
if
(
result
==
"true"
)
{
return
true
;
}
else
{
return
false
;
}
return
parseBoolStringToBool
(
result
);
}
else
{
return
android
.
removeFavoriteUser
(
shopMemberId
);
}
...
...
@@ -367,14 +363,10 @@ NativeBridgeDataSource.removeFavoriteUser = function (shopMemberId) {
NativeBridgeDataSource
.
addFavoriteUser
=
function
(
shopMemberId
)
{
if
(
deviceInfo
.
isiOS
())
{
var
result
=
callNativeApp
(
NATIVE_KEY_IOS
.
addFavoriteUser
,
{
const
result
=
callNativeApp
(
NATIVE_KEY_IOS
.
addFavoriteUser
,
{
shopMemberId
:
shopMemberId
,
});
if
(
result
==
"true"
)
{
return
true
;
}
else
{
return
false
;
}
return
parseBoolStringToBool
(
result
);
}
else
{
return
android
.
addFavoriteUser
(
shopMemberId
);
}
...
...
@@ -391,8 +383,6 @@ NativeBridgeDataSource.getJoinCollaborationType = function () {
}
};
NativeBridgeDataSource
.
getUserInfoList
=
function
(
shopMemberId
)
{
if
(
deviceInfo
.
isiOS
())
{
return
callNativeApp
(
NATIVE_KEY_IOS
.
getUserInfoList
,
{
...
...
@@ -425,4 +415,4 @@ NativeBridgeDataSource.getHostRequestFlg = function () {
}
else
{
return
android
.
getHostRequestFlg
();
}
};
};
\ No newline at end of file
public_new/js/common/native-bridge-delegate.js
View file @
17b9e57b
...
...
@@ -270,7 +270,7 @@ NativeBridgeDelegate.updateMessages = function (roomID) {
NativeBridgeDelegate
.
saveVisitRoomInfo
=
function
(
roomID
=
""
,
roomName
=
""
)
{
if
(
deviceInfo
.
isiOS
())
{
webkit
.
messageHandlers
.
roomInfo
s
aveMessageHandlerId
.
postMessage
({
webkit
.
messageHandlers
.
roomInfo
S
aveMessageHandlerId
.
postMessage
({
roomId
:
roomID
,
roomName
:
roomName
,
});
...
...
public_new/modal_collabo_profile.html
View file @
17b9e57b
...
...
@@ -22,7 +22,7 @@
<button
type=
"button"
class=
"border-0 bg_navy"
onclick=
"CollaborationUI.removeFavoriteUserInCollaboration({{shopMemberId}})"
id=
"favoriteButton"
>
<div
class=
"d-flex flex-column"
>
<span
class=
"star active shopmember_
890"
onclick=
"CHAT_UI.favoriteUserChange(890
,this)"
></span>
<span
class=
"star active shopmember_
{{shopMemberId}}"
onclick=
"CHAT_UI.favoriteUserChange('{{shopMemberId}}'
,this)"
></span>
<span>
お気に入り解除
</span>
</div>
</button>
...
...
@@ -31,7 +31,7 @@
<button
type=
"button"
class=
"border-0 bg_navy"
onclick=
"CollaborationUI.insertFavoriteUserInCollaboration({{shopMemberId}})"
id=
"favoriteButton"
>
<div
class=
"d-flex flex-column"
>
<span
class=
"star disable shopmember_
3690"
onclick=
"Namecard.favoriteUserChange(3690
,this)"
></span>
<span
class=
"star disable shopmember_
{{shopMemberId}}"
onclick=
"Namecard.favoriteUserChange('{{shopMemberId}}'
,this)"
></span>
<span>
お気に入り登録
</span>
</div>
</button>
...
...
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