From 6f79bba69da96f9c65e49fe9904ff27fc4873578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 29 Mar 2021 11:27:27 +0200 Subject: [PATCH 1/2] Fix truncate via adding 'truncateStr' - Because the 'truncate' function uses 'trunc-html' which seem not to function anymore like expected what has to be investigated further. --- webapp/pages/admin/hashtags.vue | 2 +- webapp/plugins/vue-filters.js | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/webapp/pages/admin/hashtags.vue b/webapp/pages/admin/hashtags.vue index 3f2c1572d..57335076e 100644 --- a/webapp/pages/admin/hashtags.vue +++ b/webapp/pages/admin/hashtags.vue @@ -5,7 +5,7 @@ diff --git a/webapp/plugins/vue-filters.js b/webapp/plugins/vue-filters.js index e6fcaf1dc..94246bfc6 100644 --- a/webapp/plugins/vue-filters.js +++ b/webapp/plugins/vue-filters.js @@ -33,6 +33,18 @@ export default ({ app = {} }) => { } return trunc(value, length).html }, + truncateStr: (value = '', length = -1) => { + if (!value || typeof value !== 'string' || value.length <= 0) { + return '' + } + if (length <= 0) { + return value + } + if (length < value.length) { + return value.substring(0, length) + '…' + } + return value + }, list: (value, glue = ', ', truncate = 0) => { if (!Array.isArray(value) || !value.length) { return '' From b266e81727e6bbd5bd82f1cd255e183f5f17e72c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 29 Mar 2021 13:03:59 +0200 Subject: [PATCH 2/2] Add comments to truncate functions --- webapp/plugins/vue-filters.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webapp/plugins/vue-filters.js b/webapp/plugins/vue-filters.js index 94246bfc6..5368385b7 100644 --- a/webapp/plugins/vue-filters.js +++ b/webapp/plugins/vue-filters.js @@ -24,6 +24,7 @@ export default ({ app = {} }) => { } return accounting.formatNumber(value || 0, precision, thousands, decimals) }, + // doesn't truncate in the middle of words truncate: (value = '', length = -1) => { if (!value || typeof value !== 'string' || value.length <= 0) { return '' @@ -33,6 +34,7 @@ export default ({ app = {} }) => { } return trunc(value, length).html }, + // truncates in the middle of words truncateStr: (value = '', length = -1) => { if (!value || typeof value !== 'string' || value.length <= 0) { return ''