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

last fixes

master
Eduard Kuzmenko 5 years ago
parent
a74684b493
commit
90f694f4ed
7 changed files with 113 additions and 53 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 63
      src/components/wrappers.ts
  2. 25
      src/lib/appManagers/appImManager.ts
  3. 26
      src/lib/appManagers/appMediaViewer.ts
  4. 4
      src/lib/appManagers/appMessagesManager.ts
  5. 8
      src/scss/partials/_chat.scss
  6. 29
      src/scss/partials/_sidebar.scss
  7. 1
      src/scss/style.scss

63
src/components/wrappers.ts
Unescape View File

@ -156,7 +156,7 @@ export function wrapVideo(this: any, doc: MTDocument, container: HTMLDivElement,
} }
} }
export function wrapDocument(doc: MTDocument, withTime = false): HTMLDivElement { export function wrapDocument(doc: MTDocument, withTime = false, uploading = false): HTMLDivElement {
if(doc.type == 'voice') { if(doc.type == 'voice') {
return wrapAudio(doc, withTime); return wrapAudio(doc, withTime);
} }
@ -190,49 +190,44 @@ export function wrapDocument(doc: MTDocument, withTime = false): HTMLDivElement
docDiv.innerHTML = ` docDiv.innerHTML = `
<div class="document-ico ext-${ext}">${ext2}</div> <div class="document-ico ext-${ext}">${ext2}</div>
<div class="document-download"><div class="tgico-download"></div></div> ${!uploading ? `<div class="document-download"><div class="tgico-download"></div></div>` : ''}
<div class="document-name">${fileName}</div> <div class="document-name">${fileName}</div>
<div class="document-size">${size}</div> <div class="document-size">${size}</div>
`; `;
let downloadDiv = docDiv.querySelector('.document-download') as HTMLDivElement; if(!uploading) {
let preloader: ProgressivePreloader; let downloadDiv = docDiv.querySelector('.document-download') as HTMLDivElement;
let promise: CancellablePromise<Blob>; let preloader: ProgressivePreloader;
let promise: CancellablePromise<Blob>;
docDiv.addEventListener('click', () => {
if(!promise) {
if(downloadDiv.classList.contains('downloading')) {
return; // means not ready yet
}
if(!preloader) { docDiv.addEventListener('click', () => {
preloader = new ProgressivePreloader(null, true); if(!promise) {
} if(downloadDiv.classList.contains('downloading')) {
return; // means not ready yet
appDocsManager.saveDocFile(doc.id).then(res => { }
promise = res.promise;
preloader.attach(downloadDiv, true, promise); if(!preloader) {
preloader = new ProgressivePreloader(null, true);
}
promise.then(() => { appDocsManager.saveDocFile(doc.id).then(res => {
downloadDiv.classList.remove('downloading'); promise = res.promise;
downloadDiv.remove();
});
})
downloadDiv.classList.add('downloading'); preloader.attach(downloadDiv, true, promise);
} else {
downloadDiv.classList.remove('downloading');
promise = null;
}
});
/* apiFileManager.getDownloadedFile(Object.assign({}, doc, {_: 'inputDocumentFileLocation'})).then(() => { promise.then(() => {
downloadDiv.classList.remove('downloading'); downloadDiv.classList.remove('downloading');
downloadDiv.remove(); downloadDiv.remove();
}, () => { });
})
}); */ downloadDiv.classList.add('downloading');
} else {
downloadDiv.classList.remove('downloading');
promise = null;
}
});
}
return docDiv; return docDiv;
} }

25
src/lib/appManagers/appImManager.ts
Unescape View File

@ -281,6 +281,12 @@ class ChatInput {
this.attachMediaPopUp.mediaContainer.style.height = ''; this.attachMediaPopUp.mediaContainer.style.height = '';
this.attachMediaPopUp.mediaContainer.classList.remove('is-document'); this.attachMediaPopUp.mediaContainer.classList.remove('is-document');
if(file.type.indexOf('video/') === 0) {
willAttach = 'document';
} else if(file.type.indexOf('image/') === -1 && willAttach == 'media') {
willAttach = 'document';
}
switch(willAttach) { switch(willAttach) {
case 'media': { case 'media': {
let img = new Image(); let img = new Image();
@ -311,7 +317,7 @@ class ChatInput {
'image/gif', 'image/gif',
'image/webp', 'image/webp',
'image/bmp'].indexOf(file.type) !== -1 ? 'photo' : 'doc' 'image/bmp'].indexOf(file.type) !== -1 ? 'photo' : 'doc'
} as any, false); } as any, false, true);
this.attachMediaPopUp.titleEl.innerText = 'Send File'; this.attachMediaPopUp.titleEl.innerText = 'Send File';
@ -382,6 +388,11 @@ class ChatInput {
height: willAttachHeight height: willAttachHeight
}); });
appImManager.scroll.scrollTop = appImManager.scroll.scrollHeight; appImManager.scroll.scrollTop = appImManager.scroll.scrollHeight;
let dialog = appMessagesManager.getDialogByPeerID(appImManager.peerID)[0];
if(dialog && dialog.top_message) {
appMessagesManager.readHistory(appImManager.peerID, dialog.top_message); // lol
}
}); });
this.btnSend.addEventListener('click', () => { this.btnSend.addEventListener('click', () => {
@ -479,6 +490,11 @@ class ChatInput {
appImManager.scroll.scrollTop = appImManager.scroll.scrollHeight; appImManager.scroll.scrollTop = appImManager.scroll.scrollHeight;
} }
let dialog = appMessagesManager.getDialogByPeerID(appImManager.peerID)[0];
if(dialog && dialog.top_message) {
appMessagesManager.readHistory(appImManager.peerID, dialog.top_message); // lol
}
this.editMsgID = 0; this.editMsgID = 0;
this.replyToMsgID = 0; this.replyToMsgID = 0;
this.noWebPage = false; this.noWebPage = false;
@ -646,7 +662,10 @@ export class AppImManager {
} = e.detail; } = e.detail;
this.deleteMessagesByIDs(Object.keys(detail.msgs).map(s => +s)); this.deleteMessagesByIDs(Object.keys(detail.msgs).map(s => +s));
this.deleteEmptySideDivs();
setTimeout(() => {
this.deleteEmptySideDivs();
}, 0);
}); });
// Calls when message successfully sent and we have an ID // Calls when message successfully sent and we have an ID
@ -1780,7 +1799,7 @@ export class AppImManager {
case 'audio': case 'audio':
case 'document': { case 'document': {
let docDiv = wrapDocument(pending); let docDiv = wrapDocument(pending, false, true);
let icoDiv = docDiv.querySelector('.document-ico'); let icoDiv = docDiv.querySelector('.document-ico');
preloader.attach(icoDiv, false); preloader.attach(icoDiv, false);

26
src/lib/appManagers/appMediaViewer.ts
Unescape View File

@ -6,6 +6,8 @@ import { RichTextProcessor } from "../richtextprocessor";
import { logger } from "../polyfill"; import { logger } from "../polyfill";
import ProgressivePreloader from "../../components/preloader"; import ProgressivePreloader from "../../components/preloader";
import { wrapVideo } from "../../components/wrappers"; import { wrapVideo } from "../../components/wrappers";
import { findUpClassName } from "../utils";
import appDocsManager from "./appDocsManager";
export class AppMediaViewer { export class AppMediaViewer {
private overlaysDiv = document.querySelector('.overlays') as HTMLDivElement; private overlaysDiv = document.querySelector('.overlays') as HTMLDivElement;
@ -81,13 +83,33 @@ export class AppMediaViewer {
this.buttons.download.addEventListener('click', () => { this.buttons.download.addEventListener('click', () => {
let message = appMessagesManager.getMessage(this.currentMessageID); let message = appMessagesManager.getMessage(this.currentMessageID);
appPhotosManager.downloadPhoto(message.media.photo.id); if(message.media.photo) {
appPhotosManager.downloadPhoto(message.media.photo.id);
} else {
let document: any = null;
if(message.media.webpage) document = message.media.webpage.document;
else document = message.media.document;
if(document) {
console.log('will save document:', document);
appDocsManager.saveDocFile(document.id);
}
}
}); });
this.onClickBinded = (e: MouseEvent) => { this.onClickBinded = (e: MouseEvent) => {
let target = e.target as HTMLElement; let target = e.target as HTMLElement;
if(target == this.mediaViewerDiv || target.tagName == 'IMG') { let mover: HTMLDivElement = null;
['media-viewer-mover', 'media-viewer-buttons', 'media-viewer-author'].find(s => {
try {
mover = findUpClassName(target, s);
if(mover) return true;
} catch(err) {return false;}
});
if(/* target == this.mediaViewerDiv */!mover || target.tagName == 'IMG') {
this.buttons.close.click(); this.buttons.close.click();
} }
}; };

4
src/lib/appManagers/appMessagesManager.ts
Unescape View File

@ -501,7 +501,9 @@ export class AppMessagesManager {
apiFileName = 'audio.' + (fileType.split('/')[1] == 'ogg' ? 'ogg' : 'mp3'); apiFileName = 'audio.' + (fileType.split('/')[1] == 'ogg' ? 'ogg' : 'mp3');
actionName = 'sendMessageUploadAudioAction'; actionName = 'sendMessageUploadAudioAction';
} else if(fileType.substr(0, 6) == 'video/') { } else if(fileType.substr(0, 6) == 'video/') {
attachType = 'video'; //attachType = 'video';
//apiFileName = 'video.mp4';
attachType = 'document'; // last minute fix
apiFileName = 'video.mp4'; apiFileName = 'video.mp4';
actionName = 'sendMessageUploadVideoAction'; actionName = 'sendMessageUploadVideoAction';
} else { } else {

8
src/scss/partials/_chat.scss
Unescape View File

@ -256,6 +256,7 @@
.reply-content { .reply-content {
height: auto; height: auto;
min-height: 32px;
} }
} }
@ -508,7 +509,7 @@
width: 100%; width: 100%;
} }
.text, .reply-subtitle { .text/* , .reply-subtitle */ {
line-height: 1.2; line-height: 1.2;
} }
@ -519,6 +520,7 @@
} }
.reply { .reply {
max-width: 300px;
margin-bottom: 6px; margin-bottom: 6px;
margin-top: 0; margin-top: 0;
cursor: pointer; cursor: pointer;
@ -1132,6 +1134,7 @@
height: 32px; height: 32px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between;
} }
&-title { &-title {
@ -1140,7 +1143,8 @@
&-title, &-subtitle { &-title, &-subtitle {
font-size: 14px; font-size: 14px;
line-height: 18px; //line-height: 18px;
line-height: 1;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;

29
src/scss/partials/_sidebar.scss
Unescape View File

@ -162,13 +162,18 @@
} }
#content-docs { #content-docs {
padding: 3px 15px; padding: 7px 20px;
.document { .document {
padding-left: 5rem; padding-left: 4rem;
padding-right: 1rem; padding-right: 1rem;
//height: 54px; //height: 54px;
height: calc(54px + 1.5rem); height: calc(50px + 1.5rem);
&-ico, &-download {
width: 48px;
height: 48px;
}
/* & + .document { /* & + .document {
margin-top: 1.5rem; margin-top: 1.5rem;
@ -191,8 +196,10 @@
> div { > div {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-top: 15px; margin-top: 20px;
padding-bottom: 10px; margin-left: 5px;
padding-bottom: 2px;
//padding-bottom: 10px;
position: relative; position: relative;
padding-left: 60px; padding-left: 60px;
overflow: hidden; overflow: hidden;
@ -202,7 +209,7 @@
.preview { .preview {
height: 48px; height: 48px;
width: 48px; width: 48px;
border-radius: $border-radius; border-radius: 5px;
overflow: hidden; overflow: hidden;
position: absolute; position: absolute;
left: 0; left: 0;
@ -228,6 +235,16 @@
overflow: hidden; overflow: hidden;
} }
} }
.title {
font-size: 16px;
margin-top: 3px;
}
.subtitle {
font-size: 14px;
max-width: 300px;
}
} }
#content-audio { #content-audio {

1
src/scss/style.scss
Unescape View File

@ -1382,6 +1382,7 @@ div.scrollable::-webkit-scrollbar-thumb {
&.active { &.active {
position: relative; position: relative;
color: $blue; color: $blue;
font-size: 16px;
&:after { &:after {
content: ''; content: '';

Write Preview
Loading…
Cancel
Save