kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into bug/4040-default-tag

Browse Source
This commit is contained in:
kyle
2017-12-22 23:35:54 -06:00
committed by GitHub
parent 57db23ed1f 135fc34077
commit 7469705bef
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/plugins/oas3/spec-extensions/wrap-selectors.js
View File

@@ -72,10 +72,10 @@ export const servers = onlyOAS3(createSelector(
export const isOAS3 = (ori, system) => () => { export const isOAS3 = (ori, system) => () => {
const spec = system.getSystem().specSelectors.specJson() const spec = system.getSystem().specSelectors.specJson()
return isOAS3Helper(spec) return isOAS3Helper(Map.isMap(spec) ? spec : Map())
} }
export const isSwagger2 = (ori, system) => () => { export const isSwagger2 = (ori, system) => () => {
const spec = system.getSystem().specSelectors.specJson() const spec = system.getSystem().specSelectors.specJson()
return isSwagger2Helper(spec) return isSwagger2Helper(Map.isMap(spec) ? spec : Map())
} }

2
src/core/plugins/spec/actions.js
View File

@@ -68,7 +68,7 @@ export const parseToJson = (str) => ({specActions, specSelectors, errActions}) =
line: e.mark && e.mark.line ? e.mark.line + 1 : undefined line: e.mark && e.mark.line ? e.mark.line + 1 : undefined
}) })
} }
if(json) { if(json && typeof json === "object") {
return specActions.updateJsonSpec(json) return specActions.updateJsonSpec(json)
} }
return {} return {}