From 4098e68852b846bc493d7f0953bdcc8da8adf0e7 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 26 Jul 2019 14:12:52 +0000 Subject: [PATCH] [Trunk | Admin]: div-help-contents.component & page-help-contents.component: Add regex to replace multiple spaces, new lines and tabs with one space. git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-admin-portal/trunk@56784 d315682c-612b-4755-9ff5-7f18f6832af3 --- src/app/pages/divhelpcontent/div-help-contents.component.ts | 1 + src/app/pages/helpcontent/page-help-contents.component.ts | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/app/pages/divhelpcontent/div-help-contents.component.ts b/src/app/pages/divhelpcontent/div-help-contents.component.ts index 33cb3f9..a9524a4 100644 --- a/src/app/pages/divhelpcontent/div-help-contents.component.ts +++ b/src/app/pages/divhelpcontent/div-help-contents.component.ts @@ -294,6 +294,7 @@ export class DivHelpContentsComponent implements OnInit { public cutContent(divHelpContent: DivHelpContent) { divHelpContent.content = divHelpContent.content.replace(/<[^>]*>/g, ''); + divHelpContent.content = divHelpContent.content.replace(/(\r\n|\n|\r| +(?= ))|\s\s+/gm," "); if(divHelpContent.content.length > 200) { divHelpContent.content = divHelpContent.content.substr(0, 200) + "..."; } diff --git a/src/app/pages/helpcontent/page-help-contents.component.ts b/src/app/pages/helpcontent/page-help-contents.component.ts index 0fd707e..c67c900 100644 --- a/src/app/pages/helpcontent/page-help-contents.component.ts +++ b/src/app/pages/helpcontent/page-help-contents.component.ts @@ -303,6 +303,8 @@ export class PageHelpContentsComponent implements OnInit { public cutContent(pageHelpContent: PageHelpContent) { pageHelpContent.content = pageHelpContent.content.replace(/<[^>]*>/g, ''); + pageHelpContent.content = pageHelpContent.content.replace(/(\r\n|\n|\r| +(?= ))/gm," "); + console.info(pageHelpContent.content.length, pageHelpContent.content); if(pageHelpContent.content.length > 200) { pageHelpContent.content = pageHelpContent.content.substr(0, 200) + "..."; }