TeaSpeak/TeaWeb
TeaSpeak/TeaWeb
1
0
Fork 0
Code Issues 1 Pull requests Activity

Merged with master and fixed some minor issues

Browse source
This commit is contained in:
WolverinDEV 2020-08-01 13:07:33 +02:00
parent 08402f3ef2
commit c17c1113c8
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
shared/html/templates.html
View file

@ -1890,8 +1890,8 @@
</div> </div>
<div class="container general-updates">{{tr "GU" /}}</div> <div class="container general-updates">{{tr "GU" /}}</div>
<div class="container general-keymap"></div> <div class="container general-keymap"></div>
<div class="container general-chat"></div> <div class="container general-notifications"></div>
<div class="container general-notifications"> <div class="container general-chat">
<label> <label>
<div class="checkbox"> <div class="checkbox">
<input type="checkbox" class="option-fixed-timestamps"> <input type="checkbox" class="option-fixed-timestamps">

2
shared/js/ui/frames/side/ConversationManager.ts
View file

@ -743,6 +743,7 @@ export class ConversationManager extends AbstractChatManager<ConversationUIEvent
} }
setSelectedConversation(id: number) { setSelectedConversation(id: number) {
if(id >= 0)
this.findOrCreateConversation(id); this.findOrCreateConversation(id);
this.uiEvents.fire("notify_selected_chat", { chatId: id.toString() }); this.uiEvents.fire("notify_selected_chat", { chatId: id.toString() });
@ -798,7 +799,6 @@ export class ConversationManager extends AbstractChatManager<ConversationUIEvent
return; return;
} }
for(const entry of command.arguments) { for(const entry of command.arguments) {
conversation.historyQueryResponse.push({ conversation.historyQueryResponse.push({
timestamp: parseInt(entry["timestamp"]), timestamp: parseInt(entry["timestamp"]),

5
shared/js/ui/frames/side/PrivateConversationHistory.ts
View file

@ -230,8 +230,13 @@ loader.register_task(Stage.JAVASCRIPT_INITIALIZING, {
throw tr("Missing Indexed DB support"); throw tr("Missing Indexed DB support");
} }
try {
await doOpenDatabase(false); await doOpenDatabase(false);
log.debug(LogCategory.CHAT, tr("Successfully initialized private conversation history database")); log.debug(LogCategory.CHAT, tr("Successfully initialized private conversation history database"));
} catch (error) {
log.error(LogCategory.CHAT, tr("Failed to initialize private conversation history database: %o"), error);
log.error(LogCategory.CHAT, tr("Do not saving the private conversation chat."));
}
} }
}); });