Prechádzať zdrojové kódy

Merge pull request #2403 from pixelfed/staging

Update components
daniel 4 rokov pred
rodič
commit
f747897290

BIN
public/js/profile.js


BIN
public/js/rempos.js


BIN
public/mix-manifest.json


+ 7 - 1
resources/assets/js/components/Profile.vue

@@ -140,7 +140,7 @@
 										<span class="font-weight-bold pr-3">{{profile.display_name}}</span>
 										<span class="font-weight-bold pr-3">{{profile.display_name}}</span>
 									</p>
 									</p>
 									<div v-if="profile.note" class="mb-0" v-html="profile.note"></div>
 									<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>
 							</div>
 						</div>
 						</div>
@@ -1270,6 +1270,12 @@
 						self.followingModalSearch = null;
 						self.followingModalSearch = null;
 					});
 					});
 				}
 				}
+			},
+
+			truncate(str, len) {
+				return _.truncate(str, {
+					length: len
+				});
 			}
 			}
 		}
 		}
 	}
 	}

+ 1 - 1
resources/assets/js/components/RemotePost.vue

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