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
a6846c4b
Commit
a6846c4b
authored
Jul 16, 2021
by
Kim Peace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed shopMemberId to shopMemberID
parent
37bc4f94
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
public_new/js/views/chats/chat-room-message.js
+1
-1
public_new/js/views/collaboration/collaboration.js
+7
-7
No files found.
public_new/js/views/chats/chat-room-message.js
View file @
a6846c4b
...
@@ -200,7 +200,7 @@ ChatRoom.renderDateLabelMessage = function (template, beforeDate) {
...
@@ -200,7 +200,7 @@ ChatRoom.renderDateLabelMessage = function (template, beforeDate) {
};
};
ChatRoom
.
getChatMessageTemplate
=
function
(
messageType
,
senderID
)
{
ChatRoom
.
getChatMessageTemplate
=
function
(
messageType
,
senderID
)
{
if
(
senderID
==
currentUserInfo
.
shopMemberI
d
)
{
if
(
senderID
==
currentUserInfo
.
shopMemberI
D
)
{
return
myMessageTemplate
;
return
myMessageTemplate
;
}
else
if
(
messageType
==
MessageType
.
SYSTEM
)
{
}
else
if
(
messageType
==
MessageType
.
SYSTEM
)
{
return
systemMessageTemplate
;
return
systemMessageTemplate
;
...
...
public_new/js/views/collaboration/collaboration.js
View file @
a6846c4b
...
@@ -109,14 +109,14 @@ CollaborationUI.scrollControl = function (event) {
...
@@ -109,14 +109,14 @@ CollaborationUI.scrollControl = function (event) {
/*********************************
/*********************************
* NameCard in Collaboration
* NameCard in Collaboration
********************************/
********************************/
CollaborationUI
.
makeNameCard
=
function
(
shopMemberI
d
)
{
CollaborationUI
.
makeNameCard
=
function
(
shopMemberI
D
)
{
if
(
currentUserInfo
.
shopMemberID
==
shopMemberI
d
)
{
if
(
currentUserInfo
.
shopMemberID
==
shopMemberI
D
)
{
return
;
return
;
}
}
const
namecardTemplate
=
getTemplate
(
TemplateURL
.
COLLABORATION_PROFILE
);
const
namecardTemplate
=
getTemplate
(
TemplateURL
.
COLLABORATION_PROFILE
);
const
nameCardInfo
=
NativeBridgeDataSource
.
getNameCardData
(
shopMemberI
d
);
const
nameCardInfo
=
NativeBridgeDataSource
.
getNameCardData
(
shopMemberI
D
);
nameCardInfo
.
profileUrl
=
Common
.
getProfileImgUrl
(
nameCardInfo
.
profileUrl
);
nameCardInfo
.
profileUrl
=
Common
.
getProfileImgUrl
(
nameCardInfo
.
profileUrl
);
let
isCollaborationHost
=
coview_api
.
getRoomUsers
();
let
isCollaborationHost
=
coview_api
.
getRoomUsers
();
...
@@ -145,16 +145,16 @@ CollaborationUI.makeNameCard = function (shopMemberId) {
...
@@ -145,16 +145,16 @@ CollaborationUI.makeNameCard = function (shopMemberId) {
$
(
"#userNameCardInCollaboration"
).
modal
(
"show"
);
$
(
"#userNameCardInCollaboration"
).
modal
(
"show"
);
};
};
CollaborationUI
.
removeFavoriteUserInCollaboration
=
function
(
shopMemberI
d
)
{
CollaborationUI
.
removeFavoriteUserInCollaboration
=
function
(
shopMemberI
D
)
{
Common
.
showLoadingIndicator
();
Common
.
showLoadingIndicator
();
$
(
"#userNameCardInCollaboration"
).
modal
(
"hide"
);
$
(
"#userNameCardInCollaboration"
).
modal
(
"hide"
);
NativeBridgeDataSource
.
removeFavoriteUser
(
shopMemberI
d
);
NativeBridgeDataSource
.
removeFavoriteUser
(
shopMemberI
D
);
Common
.
dismissLoadingIndicator
();
Common
.
dismissLoadingIndicator
();
};
};
CollaborationUI
.
insertFavoriteUserInCollaboration
=
function
(
shopMemberI
d
)
{
CollaborationUI
.
insertFavoriteUserInCollaboration
=
function
(
shopMemberI
D
)
{
$
(
"#userNameCardInCollaboration"
).
modal
(
"hide"
);
$
(
"#userNameCardInCollaboration"
).
modal
(
"hide"
);
NativeBridgeDataSource
.
addFavoriteUser
(
shopMemberI
d
);
NativeBridgeDataSource
.
addFavoriteUser
(
shopMemberI
D
);
Common
.
dismissLoadingIndicator
();
Common
.
dismissLoadingIndicator
();
};
};
...
...
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