Skip to content

Commit 4a0e87f

Browse files
committedNov 30, 2019
Предпросмотр гифок, видео и фотодокументов в ответе на сообщение
1 parent a681145 commit 4a0e87f

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed
 

Diff for: ‎src/components/ActionMenus/ActionsMenu.vue

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
<style>
4646
.act_menu_wrap {
4747
position: relative;
48+
z-index: 3;
4849
}
4950
5051
.act_menu_btn_wrap {

Diff for: ‎src/components/messages/MessagesPeer.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<Icon name="mention" width="20" height="18" />
2424
</div>
2525
<div :class="['im_peer_unread', { outread, muted: peer.muted }]"
26-
:title="peer.unread"
26+
:title="peer.unread || ''"
2727
>{{ convertCount(peer.unread || '') }}</div>
2828
</div>
2929
</div>

Diff for: ‎src/components/messages/chat/attachments/PhotosLayout.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
4747
photos.push(
4848
...video.map((video) => {
49-
return Object.assign(video.image[video.image.length-2], {
49+
return Object.assign(video.image[6] || video.image[video.image.length-1], {
5050
isVideo: true,
5151
duration: parseDuration(video.duration)
5252
});
@@ -57,7 +57,7 @@
5757
if(doc) {
5858
photos.push(
5959
...doc.map((doc) => {
60-
return Object.assign(getPhotoFromSizes(doc.preview.photo.sizes, 'o'), {
60+
return Object.assign(getPhotoFromSizes(doc.preview.photo.sizes, 'y'), {
6161
isDoc: true,
6262
ext: doc.ext
6363
});

Diff for: ‎src/components/messages/chat/attachments/Reply.vue

+6-2
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,14 @@
2121
getPhoto(msg) {
2222
let url;
2323
24-
const { photo, sticker } = msg.attachments;
24+
const { photo, sticker, doc, video } = msg.attachments;
25+
const photoDoc = doc && doc.find((doc) => doc.preview);
26+
const videoImages = video && video[0].image;
2527
2628
if(photo) url = getPhotoFromSizes(photo[0].sizes, 'o').url;
27-
if(sticker) url = sticker[0].images[1].url;
29+
else if(sticker) url = sticker[0].images[1].url;
30+
else if(photoDoc) url = getPhotoFromSizes(photoDoc.preview.photo.sizes, 'm').src;
31+
else if(video) url = (videoImages[6] || videoImages[videoImages.length-1]).url;
2832
2933
return url;
3034
},

0 commit comments

Comments
 (0)