dan/Nertivia-Client
1
0
Fork 0
mirror of https://github.com/danbulant/Nertivia-Client synced 2026-07-05 02:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed bugs

Browse source
This commit is contained in:
supertiger1234 2019-11-14 14:30:50 +00:00
parent 15a7d4733d
commit ac3a8a9e44
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/app/MessageTemplate.vue
View file

@ -88,7 +88,6 @@
import ProfilePicture from "@/components/ProfilePictureTemplate.vue"; import ProfilePicture from "@/components/ProfilePictureTemplate.vue";
import SimpleMarkdown from "./SimpleMarkdown.vue"; import SimpleMarkdown from "./SimpleMarkdown.vue";
import messageEmbedTemplate from "./messageEmbedTemplate"; import messageEmbedTemplate from "./messageEmbedTemplate";
import messageFormatter from "@/utils/messageFormatter.js";
import config from "@/config.js"; import config from "@/config.js";
import friendlyDate from "@/utils/date"; import friendlyDate from "@/utils/date";
import path from "path"; import path from "path";
@ -240,9 +239,6 @@ export default {
file.url = config.domain + "/files/" + file.fileID; file.url = config.domain + "/files/" + file.fileID;
return file; return file;
}, },
formatMessage() {
return messageFormatter(this.$props.message);
},
getDate() { getDate() {
return friendlyDate(this.$props.date); return friendlyDate(this.$props.date);
}, },

9
src/components/app/Popouts/Popouts/userInformationPopout.vue
View file

@ -78,11 +78,7 @@
> >
<div class="key">{{aboutItem.key}}:</div> <div class="key">{{aboutItem.key}}:</div>
<div class="emoji" v-if="aboutItem.emoji" v-html="aboutItem.emoji"></div> <div class="emoji" v-if="aboutItem.emoji" v-html="aboutItem.emoji"></div>
<div <SimpleMarkdown class="name" v-if="aboutItem.key === 'About me'" :message="aboutItem.name" />
class="name"
v-if="aboutItem.key === 'About me'"
v-html="formatAboutMe(aboutItem.name)"
></div>
<div class="name" v-else>{{aboutItem.name}}</div> <div class="name" v-else>{{aboutItem.name}}</div>
</div> </div>
<div class="about-item"> <div class="about-item">
@ -105,11 +101,12 @@ import relationshipService from "@/services/RelationshipService.js";
import surveyItems from "@/utils/surveyItems.js"; import surveyItems from "@/utils/surveyItems.js";
import emojiParser from "@/utils/emojiParser.js"; import emojiParser from "@/utils/emojiParser.js";
import messageFormatter from "@/utils/messageFormatter.js"; import messageFormatter from "@/utils/messageFormatter.js";
import SimpleMarkdown from "@/components/app/SimpleMarkdown";
import badges from "@/utils/Badges"; import badges from "@/utils/Badges";
import friendlyDate from "@/utils/date"; import friendlyDate from "@/utils/date";
export default { export default {
components: { Spinner, profilePicture }, components: { Spinner, profilePicture, SimpleMarkdown },
data() { data() {
return { return {
surveyItems: Object.assign({}, surveyItems), surveyItems: Object.assign({}, surveyItems),