Merge pull request #2403 from pixelfed/staging

Update components
This commit is contained in:
daniel 2020-09-04 19:18:43 -06:00 committed by GitHub
commit f747897290
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 6 deletions

File diff suppressed because one or more lines are too long

2
public/js/rempos.js vendored

File diff suppressed because one or more lines are too long

View File

@ -18,10 +18,10 @@
"/js/hashtag.js": "/js/hashtag.js?id=7e57442cbe641b10bfae",
"/js/loops.js": "/js/loops.js?id=ac610897b12207c829b9",
"/js/mode-dot.js": "/js/mode-dot.js?id=1225a9aac7a93d5d232f",
"/js/profile.js": "/js/profile.js?id=c94bee5912b960a5ed4e",
"/js/profile.js": "/js/profile.js?id=5312178d20bc43ac2d45",
"/js/profile-directory.js": "/js/profile-directory.js?id=611af669221ad8be3068",
"/js/quill.js": "/js/quill.js?id=00f2dca2463b3c9d3920",
"/js/rempos.js": "/js/rempos.js?id=b0e81561d85612cf9aab",
"/js/rempos.js": "/js/rempos.js?id=f7c284ac260f4f9b9474",
"/js/rempro.js": "/js/rempro.js?id=bfe52f1149330c486da7",
"/js/search.js": "/js/search.js?id=0c1e20a004ada75853ec",
"/js/status.js": "/js/status.js?id=5aa655780506cde35b92",

View File

@ -140,7 +140,7 @@
<span class="font-weight-bold pr-3">{{profile.display_name}}</span>
</p>
<div v-if="profile.note" class="mb-0" v-html="profile.note"></div>
<p v-if="profile.website" class=""><a :href="profile.website" class="profile-website" rel="me external nofollow noopener" target="_blank">{{profile.website}}</a></p>
<p v-if="profile.website" class=""><a :href="profile.website" class="profile-website" rel="me external nofollow noopener" target="_blank">{{truncate(profile.website,24)}}</a></p>
</div>
</div>
</div>
@ -1270,6 +1270,12 @@
self.followingModalSearch = null;
});
}
},
truncate(str, len) {
return _.truncate(str, {
length: len
});
}
}
}

View File

@ -791,7 +791,7 @@ export default {
},
fetchComments() {
let url = '/api/v2/comments/'+this.statusUsername+'/status/'+this.statusId;
let url = '/api/v2/comments/'+this.statusProfileId+'/status/'+this.statusId;
axios.get(url)
.then(response => {
let self = this;