Skip to content

Commit 1eb9e0a

Browse files
Carolina WrightCarolina Wright
authored andcommitted
CONSOLE-275: not displaying types
1 parent 33a203c commit 1eb9e0a

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

dist/scripts/api-console.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4958,12 +4958,16 @@ RAML.Inspector = (function() {
49584958
return type.properties;
49594959
}
49604960

4961+
function getType(type) {
4962+
return type.type ? (Array.isArray(type.type) ? type.type[0] : getType(type.type)) : type.type;
4963+
}
4964+
49614965
function mergeType(type, types) {
49624966
var resultingType = angular.copy(type);
49634967
resultingType.type = resultingType.type || resultingType.schema;
49644968
var properties = angular.copy(resultingType.properties || {});
4965-
var currentType = Array.isArray(resultingType.type) ?
4966-
resultingType.type[0] : resultingType.type;
4969+
4970+
var currentType = getType(resultingType);
49674971

49684972
properties = convertProperties(resultingType);
49694973

src/common/inspector/types.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,16 @@
8989
return type.properties;
9090
}
9191

92+
function getType(type) {
93+
return type.type ? (Array.isArray(type.type) ? type.type[0] : getType(type.type)) : type.type;
94+
}
95+
9296
function mergeType(type, types) {
9397
var resultingType = angular.copy(type);
9498
resultingType.type = resultingType.type || resultingType.schema;
9599
var properties = angular.copy(resultingType.properties || {});
96-
var currentType = Array.isArray(resultingType.type) ?
97-
resultingType.type[0] : resultingType.type;
100+
101+
var currentType = getType(resultingType);
98102

99103
properties = convertProperties(resultingType);
100104

0 commit comments

Comments
 (0)