From d521422a97d8364253902f2f302b411d85120d86 Mon Sep 17 00:00:00 2001 From: Herb Miller Date: Wed, 21 Sep 2022 11:37:18 +0100 Subject: [PATCH] Use BlockDescription to format block.description in oik-block/blockinfo #55 --- src/oik-blockinfo/blockinfo.js | 4 ++-- src/oik-blocklist/blocklist.js | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/oik-blockinfo/blockinfo.js b/src/oik-blockinfo/blockinfo.js index 88a0423..0ee64c3 100644 --- a/src/oik-blockinfo/blockinfo.js +++ b/src/oik-blockinfo/blockinfo.js @@ -9,7 +9,7 @@ import {BlockSupportsInserter, getBlockorVariation} from "../oik-blockicon/blockicons"; import {BlockVariations } from "../oik-blockicon/blockvariations"; import { BlockiconStyled } from '../oik-blockicon/blockicons.js'; -import { BlockListItem } from '../oik-blocklist/blocklist'; +import { BlockListItem, BlockDescription } from '../oik-blocklist/blocklist'; /** * @@ -43,7 +43,7 @@ function BlockinfoStyled( blocknamebarvariation, showBlockLink, showBlockIcon, s //console.log( blockicon ); var blockTypeName = showBlockTypeName ?
{block.block_name} {block.name}
: null; var blockTitle = showTitle ?
{block.title}
: null; - var blockDescription = showDescription ?
{block.description}
: null; + var blockDescription = showDescription ? BlockDescription( block.description ) : null; var blockCategory = showCategory ?
{block.category}
: null; var keywords = block.keywords ? block.keywords.join() : null; var blockKeywords = showKeywords ?
{keywords}
: null; diff --git a/src/oik-blocklist/blocklist.js b/src/oik-blocklist/blocklist.js index 0fdd9d0..992c851 100644 --- a/src/oik-blocklist/blocklist.js +++ b/src/oik-blocklist/blocklist.js @@ -265,10 +265,14 @@ function BlockNoLink( block, component ) { * @constructor */ function BlockDescription( description ) { + //console.log( description ); + if ( typeof description === 'boolean') { + return( '' ); + } if ( typeof description === 'string' ) { return(description); } else { - //console.log( description ); + var descFromFirstPara = 'TBC'; //descFromFirstPara = renderToString( {description} ); //console.log( descFromFirstPara); @@ -280,4 +284,4 @@ function BlockDescription( description ) { } } -export { BlockListStyled, BlockListItem }; \ No newline at end of file +export { BlockListStyled, BlockListItem, BlockDescription }; \ No newline at end of file