r4sas/tweb-i2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bubble group after last item delete from album

Browse Source 
Fix delete whole album by context menu
This commit is contained in:
Eduard Kuzmenko 2020-11-14 01:00:04 +02:00
parent 220eefe116
commit b8e3ce1e4d
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/chat/contextMenu.ts
View File

@ -295,7 +295,7 @@ export default class ChatContextMenu {
if(appImManager.chatSelection.isSelecting) {
appImManager.chatSelection.selectionDeleteBtn.click();
} else {
new PopupDeleteMessages([this.msgID]);
new PopupDeleteMessages(this.isTargetAnAlbumItem ? [this.msgID] : appMessagesManager.getMidsByMid(this.msgID));
}
};
}

11
src/lib/appManagers/appImManager.ts
View File

@ -750,7 +750,7 @@ export class AppImManager {
return;
}
if(e.target != this.chatInputC.messageInput && target.tagName != 'INPUT') {
if(e.target != this.chatInputC.messageInput && target.tagName != 'INPUT' && !target.hasAttribute('contenteditable')) {
this.chatInputC.messageInput.focus();
placeCaretAtEnd(this.chatInputC.messageInput);
}
@ -1724,7 +1724,16 @@ export class AppImManager {
bubble.classList.add('is-first-unread');
}
// * Нужно очистить прошлую информацию, полезно если удалить последний элемент из альбома в ПОСЛЕДНЕМ БАББЛЕ ГРУППЫ (видно по аватару)
const originalMid = +bubble.dataset.mid;
if(+message.mid != originalMid) {
this.bubbleGroups.removeBubble(bubble, originalMid);
if(!updatePosition) {
this.bubbleGroups.addBubble(bubble, message, reverse);
}
}
delete this.bubbles[originalMid];
//bubble.innerHTML = '';
}