Commit a8e6659a by Kim Peace

Merge from develop

parents 86543671 7bc455df
...@@ -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,
......
...@@ -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;
......
...@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment