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

Fix 'archiving works incorrect'

Browse Source
This commit is contained in:
morethanwords 2020-08-30 15:28:54 +03:00
parent 5310d64552
commit 1eace97b1c
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/lib/appManagers/appDialogsManager.ts
View File

@ -30,7 +30,7 @@ type DialogDom = {
}; };
const testScroll = false; const testScroll = false;
const USEPINNEDDELIMITER = false; //const USEPINNEDDELIMITER = false;
class DialogsContextMenu { class DialogsContextMenu {
private element = document.getElementById('dialogs-contextmenu') as HTMLDivElement; private element = document.getElementById('dialogs-contextmenu') as HTMLDivElement;
@ -321,11 +321,7 @@ export class AppDialogsManager {
public _chatList = document.getElementById('dialogs') as HTMLUListElement; public _chatList = document.getElementById('dialogs') as HTMLUListElement;
public chatList = this._chatList; public chatList = this._chatList;
public pinnedDelimiter: HTMLDivElement; //public pinnedDelimiter: HTMLDivElement;
/* public chatsHidden: Scrollable["hiddenElements"];
public chatsVisible: Scrollable["visibleElements"];
public chatsArchivedHidden: Scrollable["hiddenElements"];
public chatsArchivedVisible: Scrollable["visibleElements"]; */
public doms: {[peerID: number]: DialogDom} = {}; public doms: {[peerID: number]: DialogDom} = {};
public lastActiveListElement: HTMLElement = null; public lastActiveListElement: HTMLElement = null;
@ -374,11 +370,11 @@ export class AppDialogsManager {
this.allUnreadCount = this.folders.menu.querySelector('.unread-count'); this.allUnreadCount = this.folders.menu.querySelector('.unread-count');
if(USEPINNEDDELIMITER) { /* if(USEPINNEDDELIMITER) {
this.pinnedDelimiter = document.createElement('div'); this.pinnedDelimiter = document.createElement('div');
this.pinnedDelimiter.classList.add('pinned-delimiter'); this.pinnedDelimiter.classList.add('pinned-delimiter');
this.pinnedDelimiter.appendChild(document.createElement('span')); this.pinnedDelimiter.appendChild(document.createElement('span'));
} } */
this.folders.menuScrollContainer = this.folders.menu.parentElement; this.folders.menuScrollContainer = this.folders.menu.parentElement;
@ -459,7 +455,7 @@ export class AppDialogsManager {
this.setLastMessage(dialog); this.setLastMessage(dialog);
this.setDialogPosition(dialog); this.setDialogPosition(dialog);
this.setPinnedDelimiter(); //this.setPinnedDelimiter();
this.setFiltersUnreadCount(); this.setFiltersUnreadCount();
}); });
@ -481,7 +477,7 @@ export class AppDialogsManager {
this.updateDialog(dialog); this.updateDialog(dialog);
} }
this.setPinnedDelimiter(); //this.setPinnedDelimiter();
this.validateForFilter(); this.validateForFilter();
this.setFiltersUnreadCount(); this.setFiltersUnreadCount();
}); });
@ -618,7 +614,7 @@ export class AppDialogsManager {
return this.loadDialogs(this.filterID); return this.loadDialogs(this.filterID);
}).then(result => { }).then(result => {
this.setPinnedDelimiter(); //this.setPinnedDelimiter();
//appSidebarLeft.onChatsScroll(); //appSidebarLeft.onChatsScroll();
this.loadDialogs(1); this.loadDialogs(1);
}); });
@ -671,7 +667,8 @@ export class AppDialogsManager {
* Удалит неподходящие чаты из списка, но не добавит их(!) * Удалит неподходящие чаты из списка, но не добавит их(!)
*/ */
public validateForFilter() { public validateForFilter() {
if(this.filterID == 0) return; // !WARNING, возможно это было зачем-то, но комментарий исправил архивирование
//if(this.filterID == 0) return;
const folder = appMessagesManager.dialogsStorage.getFolder(this.filterID); const folder = appMessagesManager.dialogsStorage.getFolder(this.filterID);
let affected = false; let affected = false;
@ -882,7 +879,7 @@ export class AppDialogsManager {
this.log.debug('setDialogPosition:', dialog, dom, pos); this.log.debug('setDialogPosition:', dialog, dom, pos);
} }
public setPinnedDelimiter() { /* public setPinnedDelimiter() {
if(!USEPINNEDDELIMITER) return; if(!USEPINNEDDELIMITER) return;
let index = -1; let index = -1;
@ -916,7 +913,7 @@ export class AppDialogsManager {
modifying.forEach(elem => { modifying.forEach(elem => {
this.scroll.updateElement(elem); this.scroll.updateElement(elem);
}); });
} } */
public setLastMessage(dialog: any, lastMessage?: any, dom?: DialogDom, highlightWord?: string) { public setLastMessage(dialog: any, lastMessage?: any, dom?: DialogDom, highlightWord?: string) {
if(!lastMessage) { if(!lastMessage) {