From a0c5bbf8229c995c7d12c5ee3dee4ed0966bbf3f Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 22 Apr 2019 21:50:06 -0600 Subject: [PATCH 1/2] Update NotificationCard --- .../assets/js/components/NotificationCard.vue | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/resources/assets/js/components/NotificationCard.vue b/resources/assets/js/components/NotificationCard.vue index 69dc8e228..65c1fbe18 100644 --- a/resources/assets/js/components/NotificationCard.vue +++ b/resources/assets/js/components/NotificationCard.vue @@ -18,27 +18,27 @@

- {{n.account.username}} liked your post. + {{truncate(n.account.username)}} liked your post.

- {{n.account.username}} commented on your post. + {{truncate(n.account.username)}} commented on your post.

- {{n.account.username}} mentioned you. + {{truncate(n.account.username)}} mentioned you.

- {{n.account.username}} followed you. + {{truncate(n.account.username)}} followed you.

- {{n.account.username}} shared your post. + {{truncate(n.account.username)}} shared your post.

@@ -73,6 +73,10 @@ this.fetchNotifications(); }, + updated() { + $('[data-toggle="tooltip"]').tooltip() + }, + methods: { fetchNotifications() { axios.get('/api/v1/notifications') @@ -114,6 +118,14 @@ } }); }, + + truncate(text) { + if(text.length <= 15) { + return text; + } + + return text.slice(0,15) + '...' + } } } \ No newline at end of file From 532c3365dbb33c4af98de8e4e9cf97fdfe071e75 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 22 Apr 2019 21:50:23 -0600 Subject: [PATCH 2/2] Update compiled assets --- public/js/timeline.js | Bin 59810 -> 60368 bytes public/mix-manifest.json | Bin 845 -> 845 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/public/js/timeline.js b/public/js/timeline.js index 8fc4c9c562b02244506628266a8a2eb155ffa743..f21624fc7717d54849727c508772bb932041c8d3 100644 GIT binary patch delta 529 zcmZ2O`05#g}OSiDDoDx3+Pg=w_`w zf{fHRHD<2_^-Y}|cvflhguQZ;ukO1+btg|gw|^Ve4c)x-z(!UM<0NAvBSW*~&2h(E FlmUHU!{-11 delta 108 zcmca`oq5q^<_#s=Hm~0{foXI7PFCj0_RgG>_lGHOX5Y)k2$S(=3sS1lI+sR0R5 delta 32 ncmX@hc9v~}DYHbPscEXYd6H>jlBtogc}l85Vq%&SS1lI+qp%4?