mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-26 00:03:16 +00:00
Update PostComponent, add custom emoji support
This commit is contained in:
parent
42602351c7
commit
0a4505ed3a
2 changed files with 16 additions and 3 deletions
|
@ -125,7 +125,7 @@
|
||||||
<div v-else>
|
<div v-else>
|
||||||
<p :class="[status.content.length > 620 ? 'mb-1 read-more' : 'mb-1']" style="overflow: hidden;">
|
<p :class="[status.content.length > 620 ? 'mb-1 read-more' : 'mb-1']" style="overflow: hidden;">
|
||||||
<a class="font-weight-bold pr-1 text-dark text-decoration-none" :href="statusProfileUrl">{{statusUsername}}</a>
|
<a class="font-weight-bold pr-1 text-dark text-decoration-none" :href="statusProfileUrl">{{statusUsername}}</a>
|
||||||
<span class="comment-text" :id="status.id + '-status-readmore'" v-html="status.content"></span>
|
<span class="comment-text" :id="status.id + '-status-readmore'" v-html="content"></span>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<hr>
|
<hr>
|
||||||
|
@ -953,7 +953,8 @@ export default {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
},
|
||||||
|
content: undefined
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
|
@ -1027,6 +1028,11 @@ export default {
|
||||||
}
|
}
|
||||||
self.status = response.data.status;
|
self.status = response.data.status;
|
||||||
self.media = self.status.media_attachments;
|
self.media = self.status.media_attachments;
|
||||||
|
self.content = response.data.status.content;
|
||||||
|
self.status.emojis.forEach(function(emoji) {
|
||||||
|
let img = `<img draggable="false" class="emojione custom-emoji" alt="${emoji.shortcode}" title="${emoji.shortcode}" src="${emoji.url}" data-original="${emoji.url}" data-static="${emoji.static_url}" width="18" height="18" />`;
|
||||||
|
self.content = self.content.replace(`:${emoji.shortcode}:`, img);
|
||||||
|
});
|
||||||
self.likesPage = 2;
|
self.likesPage = 2;
|
||||||
self.sharesPage = 2;
|
self.sharesPage = 2;
|
||||||
self.showCaption = !response.data.status.sensitive;
|
self.showCaption = !response.data.status.sensitive;
|
||||||
|
|
|
@ -160,7 +160,7 @@
|
||||||
<span class="username font-weight-bold">
|
<span class="username font-weight-bold">
|
||||||
<bdi><a class="text-dark" :href="profileUrl(status)">{{status.account.username}}</a></bdi>
|
<bdi><a class="text-dark" :href="profileUrl(status)">{{status.account.username}}</a></bdi>
|
||||||
</span>
|
</span>
|
||||||
<span class="status-content" v-html="status.content"></span>
|
<span class="status-content" v-html="content"></span>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="timestamp mt-2">
|
<div class="timestamp mt-2">
|
||||||
|
@ -241,11 +241,18 @@
|
||||||
replyText: '',
|
replyText: '',
|
||||||
replyNsfw: false,
|
replyNsfw: false,
|
||||||
emoji: window.App.util.emoji,
|
emoji: window.App.util.emoji,
|
||||||
|
content: undefined
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
mounted() {
|
mounted() {
|
||||||
|
let self = this;
|
||||||
this.profile = window._sharedData.curUser;
|
this.profile = window._sharedData.curUser;
|
||||||
|
this.content = this.status.content;
|
||||||
|
this.status.emojis.forEach(function(emoji) {
|
||||||
|
let img = `<img draggable="false" class="emojione custom-emoji" alt="${emoji.shortcode}" title="${emoji.shortcode}" src="${emoji.url}" data-original="${emoji.url}" data-static="${emoji.static_url}" width="18" height="18" />`;
|
||||||
|
self.content = self.content.replace(`:${emoji.shortcode}:`, img);
|
||||||
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
|
|
Loading…
Reference in a new issue