Redocly/redoc
1
1
Fork 0
mirror of https://github.com/Redocly/redoc.git synced 2025-08-09 22:54:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: rename normalizer function and some vars

Browse Source
This commit is contained in:
Alex Karo 2019-07-16 23:54:03 +03:00
parent bccde07990
commit 416f36f473
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/services/RedocNormalizedOptions.ts
View File

@ -111,7 +111,7 @@ export class RedocNormalizedOptions {
return value; return value;
} }
private static normalizeSampleCollapseLevel(level?: number | string | 'all'): number { private static normalizeJsonSampleExpandLevel(level?: number | string | 'all'): number {
if (level === 'all') { if (level === 'all') {
return +Infinity; return +Infinity;
} }
@ -168,7 +168,7 @@ export class RedocNormalizedOptions {
this.onlyRequiredInSamples = argValueToBoolean(raw.onlyRequiredInSamples); this.onlyRequiredInSamples = argValueToBoolean(raw.onlyRequiredInSamples);
this.showExtensions = RedocNormalizedOptions.normalizeShowExtensions(raw.showExtensions); this.showExtensions = RedocNormalizedOptions.normalizeShowExtensions(raw.showExtensions);
this.hideSingleRequestSampleTab = argValueToBoolean(raw.hideSingleRequestSampleTab); this.hideSingleRequestSampleTab = argValueToBoolean(raw.hideSingleRequestSampleTab);
this.jsonSampleExpandLevel = RedocNormalizedOptions.normalizeSampleCollapseLevel( this.jsonSampleExpandLevel = RedocNormalizedOptions.normalizeJsonSampleExpandLevel(
raw.jsonSampleExpandLevel, raw.jsonSampleExpandLevel,
); );

22
src/utils/jsonToHtml.ts
View File

@ -1,10 +1,10 @@
let level = 1; let level = 1;
export function jsonToHTML(json, maxCollapseLevel) { export function jsonToHTML(json, maxExpandLevel) {
level = 1; level = 1;
let output = ''; let output = '';
output += '<div class="redoc-json">'; output += '<div class="redoc-json">';
output += valueToHTML(json, maxCollapseLevel); output += valueToHTML(json, maxExpandLevel);
output += '</div>'; output += '</div>';
return output; return output;
} }
@ -32,20 +32,20 @@ function punctuation(val) {
return '<span class="token punctuation">' + val + '</span>'; return '<span class="token punctuation">' + val + '</span>';
} }
function valueToHTML(value, maxCollapseLevel: number) { function valueToHTML(value, maxExpandLevel: number) {
const valueType = typeof value; const valueType = typeof value;
let output = ''; let output = '';
if (value === undefined || value === null) { if (value === undefined || value === null) {
output += decorateWithSpan('null', 'token keyword'); output += decorateWithSpan('null', 'token keyword');
} else if (value && value.constructor === Array) { } else if (value && value.constructor === Array) {
level++; level++;
output += arrayToHTML(value, maxCollapseLevel); output += arrayToHTML(value, maxExpandLevel);
level--; level--;
} else if (value && value.constructor === Date) { } else if (value && value.constructor === Date) {
output += decorateWithSpan('"' + value.toISOString() + '"', 'token string'); output += decorateWithSpan('"' + value.toISOString() + '"', 'token string');
} else if (valueType === 'object') { } else if (valueType === 'object') {
level++; level++;
output += objectToHTML(value, maxCollapseLevel); output += objectToHTML(value, maxExpandLevel);
level--; level--;
} else if (valueType === 'number') { } else if (valueType === 'number') {
output += decorateWithSpan(value, 'token number'); output += decorateWithSpan(value, 'token number');
@ -69,8 +69,8 @@ function valueToHTML(value, maxCollapseLevel: number) {
return output; return output;
} }
function arrayToHTML(json, maxCollapseLevel: number) { function arrayToHTML(json, maxExpandLevel: number) {
const collapsed = level > maxCollapseLevel ? 'collapsed' : ''; const collapsed = level > maxExpandLevel ? 'collapsed' : '';
let output = `<div class="collapser"></div>${punctuation( let output = `<div class="collapser"></div>${punctuation(
'[', '[',
)}<span class="ellipsis"></span><ul class="array collapsible">`; )}<span class="ellipsis"></span><ul class="array collapsible">`;
@ -79,7 +79,7 @@ function arrayToHTML(json, maxCollapseLevel: number) {
for (let i = 0; i < length; i++) { for (let i = 0; i < length; i++) {
hasContents = true; hasContents = true;
output += '<li><div class="hoverable ' + collapsed + '">'; output += '<li><div class="hoverable ' + collapsed + '">';
output += valueToHTML(json[i], maxCollapseLevel); output += valueToHTML(json[i], maxExpandLevel);
if (i < length - 1) { if (i < length - 1) {
output += ','; output += ',';
} }
@ -92,8 +92,8 @@ function arrayToHTML(json, maxCollapseLevel: number) {
return output; return output;
} }
function objectToHTML(json, maxCollapseLevel: number) { function objectToHTML(json, maxExpandLevel: number) {
const collapsed = level > maxCollapseLevel ? 'collapsed' : ''; const collapsed = level > maxExpandLevel ? 'collapsed' : '';
const keys = Object.keys(json); const keys = Object.keys(json);
const length = keys.length; const length = keys.length;
let output = `<div class="collapser"></div>${punctuation( let output = `<div class="collapser"></div>${punctuation(
@ -105,7 +105,7 @@ function objectToHTML(json, maxCollapseLevel: number) {
hasContents = true; hasContents = true;
output += '<li><div class="hoverable ' + collapsed + '">'; output += '<li><div class="hoverable ' + collapsed + '">';
output += '<span class="property token string">"' + htmlEncode(key) + '"</span>: '; output += '<span class="property token string">"' + htmlEncode(key) + '"</span>: ';
output += valueToHTML(json[key], maxCollapseLevel); output += valueToHTML(json[key], maxExpandLevel);
if (i < length - 1) { if (i < length - 1) {
output += punctuation(','); output += punctuation(',');
} }