Skip to content

Commit 1b0db2e

Browse files
authored
Merge pull request #30 from jwag956/headermarkup
Fix Header description to honor markdown.
2 parents e2b370c + f665471 commit 1b0db2e

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

src/components/api-response.js

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
import { LitElement, html } from 'lit-element';
1+
import { LitElement, html } from 'lit-element';
22
import {schemaToModel, schemaToObj, generateExample, removeCircularReferences} from '@/utils/common-utils';
33
import vars from '@/styles/vars';
44
import FontStyles from '@/styles/font-styles';
55
import FlexStyles from '@/styles/flex-styles';
66
import TableStyles from '@/styles/table-styles';
77
import InputStyles from '@/styles/input-styles';
8-
import SchemaTree from '@/components/schema-tree';
8+
import SchemaTree from '@/components/schema-tree';
9+
import marked from 'marked';
10+
import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
911

1012
export default class ApiResponse extends LitElement {
1113
render() {
@@ -121,7 +123,7 @@ export default class ApiResponse extends LitElement {
121123
let mimeRespCount=0;
122124
for(let mimeResp in this.responses[statusCode].content ) {
123125
let mimeRespObj = this.responses[statusCode].content[mimeResp];
124-
//Remove Circular references from Response schema
126+
//Remove Circular references from Response schema
125127
/*
126128
try {
127129
mimeRespObj.schema = JSON.parse(JSON.stringify(mimeRespObj.schema, removeCircularReferences(0)));
@@ -131,16 +133,16 @@ export default class ApiResponse extends LitElement {
131133
return;
132134
}
133135
*/
134-
136+
135137
// Generate Schema
136138
let schemaTree = schemaToModel(mimeRespObj.schema,{});
137-
139+
138140
// Generate Example
139141
let respExample = generateExample(
140-
mimeRespObj.schema? mimeRespObj.schema.examples:'',
141-
mimeRespObj.schema? mimeRespObj.schema.example:'',
142-
mimeRespObj.schema,
143-
mimeResp,
142+
mimeRespObj.schema? mimeRespObj.schema.examples:'',
143+
mimeRespObj.schema? mimeRespObj.schema.example:'',
144+
mimeRespObj.schema,
145+
mimeResp,
144146
"json"
145147
);
146148
allMimeResp[mimeResp] = {
@@ -177,7 +179,7 @@ export default class ApiResponse extends LitElement {
177179
<tr>
178180
<td style="padding:0 12px;vertical-align: top;" class="regular-font-size"> ${v.name}</td>
179181
<td style="padding:0 12px;vertical-align: top; line-height:14px" class="descr-text small-font-size">
180-
${v.description}
182+
<span class="m-markdown-small">${unsafeHTML(marked(v.description))}</span>
181183
${ (v.schema && v.schema.example)? html`<br/><span style="font-weight:bold">EXAMPLE:</span> ${v.schema.example}`:`` }
182184
</td>
183185
</tr>
@@ -203,7 +205,7 @@ export default class ApiResponse extends LitElement {
203205
</div>`
204206
)}`
205207
)}`
206-
208+
207209
}
208210

209211
activateTab(e){

0 commit comments

Comments
 (0)