Skip to content
This repository was archived by the owner on Oct 20, 2022. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 211a0e8

Browse files
mathieualesmathieuales
committedJun 22, 2020
release 0.6.3
1 parent c75d1fa commit 211a0e8

15 files changed

+53
-49
lines changed
 

‎dist/css/swagger-ui.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Orange angular-swagger-ui - v0.6.2
2+
* Orange angular-swagger-ui - v0.6.3
33
*
44
* (C) 2015 Orange, all right reserved
55
* MIT Licensed

‎dist/css/swagger-ui.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/less/swagger-ui.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Orange angular-swagger-ui - v0.6.2
2+
* Orange angular-swagger-ui - v0.6.3
33
*
44
* (C) 2015 Orange, all right reserved
55
* MIT Licensed

‎dist/scripts/i18n/fr.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/scripts/i18n/jp.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/scripts/modules/openapi3-converter.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/scripts/modules/swagger-auth-ui-bootstrap-modal.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/scripts/modules/swagger-auth.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/scripts/modules/swagger-external-references.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/scripts/modules/swagger-markdown.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/scripts/modules/swagger-xml-formatter.min.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Orange angular-swagger-ui - v0.6.2
2+
* Orange angular-swagger-ui - v0.6.3
33
*
44
* (C) 2015 Orange, all right reserved
55
* MIT Licensed

‎dist/scripts/modules/swagger-yaml-parser.min.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Orange angular-swagger-ui - v0.6.2
2+
* Orange angular-swagger-ui - v0.6.3
33
*
44
* (C) 2015 Orange, all right reserved
55
* MIT Licensed

‎dist/scripts/modules/swagger1-converter.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/scripts/swagger-ui.js

+38-34
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Orange angular-swagger-ui - v0.6.2
2+
* Orange angular-swagger-ui - v0.6.3
33
*
44
* (C) 2015 Orange, all right reserved
55
* MIT Licensed
@@ -70,7 +70,7 @@ angular
7070
};
7171
}]);
7272
/*
73-
* Orange angular-swagger-ui - v0.6.2
73+
* Orange angular-swagger-ui - v0.6.3
7474
*
7575
* (C) 2015 Orange, all right reserved
7676
* MIT Licensed
@@ -318,7 +318,7 @@ angular
318318

319319
}]);
320320
/*
321-
* Orange angular-swagger-ui - v0.6.2
321+
* Orange angular-swagger-ui - v0.6.3
322322
*
323323
* (C) 2015 Orange, all right reserved
324324
* MIT Licensed
@@ -343,7 +343,7 @@ angular
343343
};
344344
});
345345
/*
346-
* Orange angular-swagger-ui - v0.6.2
346+
* Orange angular-swagger-ui - v0.6.3
347347
*
348348
* (C) 2015 Orange, all right reserved
349349
* MIT Licensed
@@ -369,7 +369,7 @@ angular
369369
};
370370
}]);
371371
/*
372-
* Orange angular-swagger-ui - v0.6.2
372+
* Orange angular-swagger-ui - v0.6.3
373373
*
374374
* (C) 2015 Orange, all right reserved
375375
* MIT Licensed
@@ -535,7 +535,7 @@ angular
535535

536536
}]);
537537
/*
538-
* Orange angular-swagger-ui - v0.6.2
538+
* Orange angular-swagger-ui - v0.6.3
539539
*
540540
* (C) 2015 Orange, all right reserved
541541
* MIT Licensed
@@ -628,7 +628,7 @@ angular
628628

629629
}]);
630630
/*
631-
* Orange angular-swagger-ui - v0.6.2
631+
* Orange angular-swagger-ui - v0.6.3
632632
*
633633
* (C) 2015 Orange, all right reserved
634634
* MIT Licensed
@@ -674,7 +674,7 @@ angular
674674

675675
}]);
676676
/*
677-
* Orange angular-swagger-ui - v0.6.2
677+
* Orange angular-swagger-ui - v0.6.3
678678
*
679679
* (C) 2015 Orange, all right reserved
680680
* MIT Licensed
@@ -732,8 +732,8 @@ angular
732732
schema = angular.copy(schema);
733733
angular.forEach(schema.allOf, function(def) {
734734
var ref = resolveReference(openApiSpec, def);
735-
if (!ref.discriminator) {
736-
// do not handle inhertited properties here
735+
if (!def.$ref || !ref.discriminator) {
736+
// do not handle inherited properties here
737737
angular.merge(schema, ref);
738738
}
739739
});
@@ -882,36 +882,40 @@ angular
882882
* generates new inline model name
883883
*/
884884
function getInlineModelName() {
885-
var name = INLINE_MODEL_NAME + (countInLineModels++);
886-
return name;
885+
return INLINE_MODEL_NAME + (countInLineModels++);
887886
}
888887

889888
/**
890889
* identify models using inheritance
891890
*/
892891
this.resolveInheritance = function(openApiSpec) {
893892
angular.forEach(openApiSpec.definitions, function(schema, modelName) {
894-
if (schema.discriminator) {
895-
schema.subModelsRef = [];
896-
angular.forEach(openApiSpec.definitions, function(subSchema, subModelName) {
897-
if (schema !== subSchema && subSchema.allOf) {
898-
angular.forEach(subSchema.allOf, function(parent) {
899-
if (parent.$ref && modelName === getClassName(parent)) {
900-
subSchema.parentModelsRef = subSchema.parentModelsRef || [];
901-
subSchema.parentModelsRef.push({
902-
'$ref': '#/definitions/' + modelName
903-
});
904-
schema.subModelsRef.push({
905-
'$ref': '#/definitions/' + subModelName
906-
});
907-
}
908-
});
909-
}
910-
});
911-
}
893+
resolveItemInheritance(openApiSpec, schema, schema, modelName);
912894
});
913895
};
914896

897+
function resolveItemInheritance(openApiSpec, schema, def, modelName) {
898+
if (def.discriminator && !schema.subModelsRef) {
899+
schema.subModelsRef = [];
900+
angular.forEach(openApiSpec.definitions, function(subSchema, subModelName) {
901+
if (modelName !== subModelName && subSchema.allOf) {
902+
angular.forEach(subSchema.allOf, function(parent) {
903+
if (parent.$ref && modelName === getClassName(parent)) {
904+
subSchema.parentModelsRef = subSchema.parentModelsRef || [];
905+
subSchema.parentModelsRef.push({
906+
'$ref': '#/definitions/' + modelName
907+
});
908+
schema.subModelsRef.push({
909+
'$ref': '#/definitions/' + subModelName
910+
});
911+
}
912+
resolveItemInheritance(openApiSpec, subSchema, parent, subModelName);
913+
});
914+
}
915+
});
916+
}
917+
}
918+
915919
/**
916920
* generate a model and its submodels from schema
917921
*/
@@ -927,7 +931,7 @@ angular
927931
if (schema.properties) {
928932
// if inline model
929933
subModels[getInlineModelName()] = schema;
930-
subModels = angular.merge(subModels, findAllModels(openApiSpec, schema, subModelIds));
934+
angular.merge(subModels, findAllModels(openApiSpec, schema, subModelIds));
931935
} else {
932936
subModels = findAllModels(openApiSpec, schema, subModelIds);
933937
}
@@ -1150,7 +1154,7 @@ angular
11501154

11511155
}]);
11521156
/*
1153-
* Orange angular-swagger-ui - v0.6.2
1157+
* Orange angular-swagger-ui - v0.6.3
11541158
*
11551159
* (C) 2015 Orange, all right reserved
11561160
* MIT Licensed
@@ -1232,7 +1236,7 @@ angular
12321236
}]);
12331237

12341238
/*
1235-
* Orange angular-swagger-ui - v0.6.2
1239+
* Orange angular-swagger-ui - v0.6.3
12361240
*
12371241
* (C) 2015 Orange, all right reserved
12381242
* MIT Licensed
@@ -1575,7 +1579,7 @@ angular
15751579
swaggerModules.add(swaggerModules.PARSE, swaggerParser, 1);
15761580
}]);
15771581
/*
1578-
* Orange angular-swagger-ui - v0.6.2
1582+
* Orange angular-swagger-ui - v0.6.3
15791583
*
15801584
* (C) 2015 Orange, all right reserved
15811585
* MIT Licensed

‎dist/scripts/swagger-ui.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
This repository has been archived.