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
a8e6659a
Commit
a8e6659a
authored
3 years ago
by
Kim Peace
Browse files
Options
Browse Files
Download
Plain Diff
Merge from develop
parents
86543671
7bc455df
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
3 deletions
+4
-3
public_new/js/views/archive/archive.js
+1
-2
public_new/js/views/collaboration/fermi-web-socket-message-handler.js
+2
-0
public_new/js/views/contact/contact.js
+1
-1
public_new/template/template_archive.html
+0
-0
public_new/template/template_archive_list.html
+0
-0
No files found.
public_new/js/views/archive/archive.js
View file @
a8e6659a
...
@@ -10,10 +10,9 @@ document.addEventListener("DOMContentLoaded", function () {
...
@@ -10,10 +10,9 @@ document.addEventListener("DOMContentLoaded", function () {
ArchiveUI
.
refreshSearchScreen
=
function
(
keyword
)
{
ArchiveUI
.
refreshSearchScreen
=
function
(
keyword
)
{
const
archiveList
=
NativeBridgeDataSource
.
getArchiveByName
(
keyword
);
const
archiveList
=
NativeBridgeDataSource
.
getArchiveByName
(
keyword
);
const
typeImage
=
ArchiveUI
.
getArchiveTypeIconURL
(
archive
.
archiveType
);
ArchiveUI
.
getArchiveTemplate
().
then
(
function
(
archiveTemplate
)
{
ArchiveUI
.
getArchiveTemplate
().
then
(
function
(
archiveTemplate
)
{
archiveList
.
forEach
(
function
(
archive
)
{
archiveList
.
forEach
(
function
(
archive
)
{
const
typeImage
=
ArchiveUI
.
getArchiveTypeIconURL
(
archive
.
archiveType
);
let
html
=
ArchiveUI
.
renderArchiveTemplate
(
let
html
=
ArchiveUI
.
renderArchiveTemplate
(
archiveTemplate
,
archiveTemplate
,
archive
.
archiveId
,
archive
.
archiveId
,
...
...
This diff is collapsed.
Click to expand it.
public_new/js/views/collaboration/fermi-web-socket-message-handler.js
View file @
a8e6659a
...
@@ -111,6 +111,8 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) {
...
@@ -111,6 +111,8 @@ FermiWebSocketMessageHandler.handleMessagesToAll = function (data) {
case
"API_WELCOME"
:
case
"API_WELCOME"
:
if
(
globalUserInfo
.
joinType
!=
COLLABORATION_JOIN_TYPE
.
INVITED
)
{
if
(
globalUserInfo
.
joinType
!=
COLLABORATION_JOIN_TYPE
.
INVITED
)
{
FermiWebSocketMessageHandler
.
apiWelcome
();
FermiWebSocketMessageHandler
.
apiWelcome
();
}
else
{
FermiWebSocketBridge
.
getCollaborationType
()
}
}
CollaborationFeature
.
updateHost
();
CollaborationFeature
.
updateHost
();
break
;
break
;
...
...
This diff is collapsed.
Click to expand it.
public_new/js/views/contact/contact.js
View file @
a8e6659a
...
@@ -83,7 +83,7 @@ Contact.appendGroupList = function (groupList) {
...
@@ -83,7 +83,7 @@ Contact.appendGroupList = function (groupList) {
const
groupTemplate
=
getTemplate
(
TemplateURL
.
GROUP_LIST
);
const
groupTemplate
=
getTemplate
(
TemplateURL
.
GROUP_LIST
);
groupList
.
forEach
(
function
(
group
)
{
groupList
.
forEach
(
function
(
group
)
{
const
html
=
renderGroupList
(
const
html
=
Contact
.
renderGroupList
(
groupTemplate
,
groupTemplate
,
group
.
groupName
,
group
.
groupName
,
group
.
groupId
,
group
.
groupId
,
...
...
This diff is collapsed.
Click to expand it.
public_new/template/template_archive.html
View file @
a8e6659a
This diff is collapsed.
Click to expand it.
public_new/template/template_archive_list.html
View file @
a8e6659a
This diff is collapsed.
Click to expand it.
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