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

Toggle selection by click on bubble's time

Browse Source 
Fix reply by doubleclicking grouped document
Fix webpages layout
This commit is contained in:
morethanwords 2021-08-10 12:08:10 +03:00
parent ac3ed37da0
commit 7988edd5f9
2 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/components/chat/bubbles.ts
View File

@ -450,9 +450,12 @@ export default class ChatBubbles {
return; return;
} }
const bubble = (e.target as HTMLElement).classList.contains('bubble') ? e.target as HTMLElement : null; const target = e.target as HTMLElement;
const bubble = target.classList.contains('bubble') ?
target :
(target.classList.contains('document-selection') ? target.parentElement : null);
if(bubble && !bubble.classList.contains('bubble-first')) { if(bubble && !bubble.classList.contains('bubble-first')) {
const mid = +bubble.dataset.mid const mid = +bubble.dataset.mid;
this.chat.input.initMessageReply(mid); this.chat.input.initMessageReply(mid);
} }
}); });
@ -801,6 +804,11 @@ export default class ChatBubbles {
return; return;
} }
if(!isTouchSupported && findUpClassName(target, 'time')) {
this.chat.selection.toggleByBubble(bubble);
return;
}
// ! Trusted - due to audio autoclick // ! Trusted - due to audio autoclick
if(this.chat.selection.isSelecting && e.isTrusted) { if(this.chat.selection.isSelecting && e.isTrusted) {
if(bubble.classList.contains('service') && bubble.dataset.mid === undefined) { if(bubble.classList.contains('service') && bubble.dataset.mid === undefined) {
@ -2479,7 +2487,7 @@ export default class ChatBubbles {
quoteTextDiv.append(previewResizer); quoteTextDiv.append(previewResizer);
} }
let t: HTMLElement; // let t: HTMLElement;
if(webpage.site_name) { if(webpage.site_name) {
let nameEl = document.createElement('a'); let nameEl = document.createElement('a');
nameEl.classList.add('webpage-name'); nameEl.classList.add('webpage-name');
@ -2487,7 +2495,7 @@ export default class ChatBubbles {
nameEl.href = webpage.url || '#'; nameEl.href = webpage.url || '#';
setInnerHTML(nameEl, RichTextProcessor.wrapEmojiText(webpage.site_name)); setInnerHTML(nameEl, RichTextProcessor.wrapEmojiText(webpage.site_name));
quoteTextDiv.append(nameEl); quoteTextDiv.append(nameEl);
t = nameEl; // t = nameEl;
} }
if(webpage.rTitle) { if(webpage.rTitle) {
@ -2495,7 +2503,7 @@ export default class ChatBubbles {
titleDiv.classList.add('title'); titleDiv.classList.add('title');
setInnerHTML(titleDiv, webpage.rTitle); setInnerHTML(titleDiv, webpage.rTitle);
quoteTextDiv.append(titleDiv); quoteTextDiv.append(titleDiv);
t = titleDiv; // t = titleDiv;
} }
if(webpage.rDescription) { if(webpage.rDescription) {
@ -2503,14 +2511,14 @@ export default class ChatBubbles {
textDiv.classList.add('text'); textDiv.classList.add('text');
setInnerHTML(textDiv, webpage.rDescription); setInnerHTML(textDiv, webpage.rDescription);
quoteTextDiv.append(textDiv); quoteTextDiv.append(textDiv);
t = textDiv; // t = textDiv;
} }
if(t) { /* if(t) {
t.append(timeSpan); t.append(timeSpan);
} else { } else {
box.classList.add('no-text'); box.classList.add('no-text');
} } */
quote.append(quoteTextDiv); quote.append(quoteTextDiv);
@ -2523,6 +2531,10 @@ export default class ChatBubbles {
bubble.classList.add('is-square-photo'); bubble.classList.add('is-square-photo');
isSquare = true; isSquare = true;
this.appPhotosManager.setAttachmentSize(webpage.photo, preview, 32, 32, false); this.appPhotosManager.setAttachmentSize(webpage.photo, preview, 32, 32, false);
/* if(t) {
t.append(timeSpan);
} */
} else if(size.h > size.w) { } else if(size.h > size.w) {
bubble.classList.add('is-vertical-photo'); bubble.classList.add('is-vertical-photo');
} }
@ -2545,8 +2557,11 @@ export default class ChatBubbles {
box.append(quote); box.append(quote);
//bubble.prepend(box); //bubble.prepend(box);
messageDiv.append(box); // if(timeSpan.parentElement === messageDiv) {
// messageDiv.insertBefore(box, messageDiv.lastElementChild); messageDiv.insertBefore(box, timeSpan);
// } else {
// messageDiv.append(box);
// }
//this.log('night running', bubble.scrollHeight); //this.log('night running', bubble.scrollHeight);

17
src/scss/partials/_chatBubble.scss
View File

@ -814,7 +814,8 @@ $bubble-margin: .25rem;
} }
.web { .web {
margin: .125rem 0; // margin: .125rem 0;
margin: .125rem 0 -.5625rem;
max-width: 100%; max-width: 100%;
overflow: hidden; overflow: hidden;
line-height: var(--line-height); line-height: var(--line-height);
@ -836,12 +837,16 @@ $bubble-margin: .25rem;
&-resizer { &-resizer {
&:first-child { &:first-child {
margin: 3px 0; margin: 3px 0;
&:last-child {
margin-bottom: 2px;
}
} }
} }
} }
&.no-text { &.no-text {
margin-bottom: .625rem; margin-bottom: .75rem;
} }
.title { .title {
@ -875,6 +880,7 @@ $bubble-margin: .25rem;
display: flex; display: flex;
&-text { &-text {
width: 100%;
// max-width: calc(100% - .625rem); // left border // max-width: calc(100% - .625rem); // left border
max-width: 100%; max-width: 100%;
padding-left: .625rem; padding-left: .625rem;
@ -902,11 +908,16 @@ $bubble-margin: .25rem;
} }
.web { .web {
.webpage-name {
margin-right: 1rem;
}
.preview-resizer { .preview-resizer {
margin: 0; margin: 0;
width: 2rem; width: 2rem;
height: 2rem; height: 2rem;
float: right; float: right;
margin-left: .625rem;
} }
.preview { .preview {
@ -1386,12 +1397,12 @@ $bubble-margin: .25rem;
pointer-events: none; // do not show title pointer-events: none; // do not show title
display: inline-flex; display: inline-flex;
z-index: 1; z-index: 1;
cursor: default;
/* display: inline-flex; /* display: inline-flex;
align-items: center; */ align-items: center; */
height: 12px; height: 12px;
direction: ltr; direction: ltr;
float: right; // * rtl fix float: right; // * rtl fix
cursor: pointer;
i { i {
font-size: 1.15rem; font-size: 1.15rem;