Skip to content
This repository has been archived by the owner on Oct 20, 2022. It is now read-only.

Commit

Permalink
release 0.6.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@mathieuales
mathieuales committed Jun 22, 2020
1 parent c75d1fa commit 211a0e8
Show file tree
Hide file tree
Showing 15 changed files with 53 additions and 49 deletions.
2 changes: 1 addition & 1 deletion dist/css/swagger-ui.css
View file
@@ -1,5 +1,5 @@
/*
* Orange angular-swagger-ui - v0.6.2
* Orange angular-swagger-ui - v0.6.3
*
* (C) 2015 Orange, all right reserved
* MIT Licensed
Expand Down
2 changes: 1 addition & 1 deletion dist/css/swagger-ui.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/less/swagger-ui.less
View file
@@ -1,5 +1,5 @@
/*
* Orange angular-swagger-ui - v0.6.2
* Orange angular-swagger-ui - v0.6.3
*
* (C) 2015 Orange, all right reserved
* MIT Licensed
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/i18n/fr.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/scripts/i18n/jp.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/scripts/modules/openapi3-converter.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/scripts/modules/swagger-auth-ui-bootstrap-modal.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/scripts/modules/swagger-auth.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/scripts/modules/swagger-external-references.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/scripts/modules/swagger-markdown.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/scripts/modules/swagger-xml-formatter.min.js
View file
@@ -1,5 +1,5 @@
/*
* Orange angular-swagger-ui - v0.6.2
* Orange angular-swagger-ui - v0.6.3
*
* (C) 2015 Orange, all right reserved
* MIT Licensed
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/modules/swagger-yaml-parser.min.js
View file
@@ -1,5 +1,5 @@
/*
* Orange angular-swagger-ui - v0.6.2
* Orange angular-swagger-ui - v0.6.3
*
* (C) 2015 Orange, all right reserved
* MIT Licensed
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/modules/swagger1-converter.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

72 changes: 38 additions & 34 deletions dist/scripts/swagger-ui.js
View file
@@ -1,5 +1,5 @@
/*
* Orange angular-swagger-ui - v0.6.2
* Orange angular-swagger-ui - v0.6.3
*
* (C) 2015 Orange, all right reserved
* MIT Licensed
Expand Down Expand Up @@ -70,7 +70,7 @@ angular
};
}]);
/*
* Orange angular-swagger-ui - v0.6.2
* Orange angular-swagger-ui - v0.6.3
*
* (C) 2015 Orange, all right reserved
* MIT Licensed
Expand Down Expand Up @@ -318,7 +318,7 @@ angular

}]);
/*
* Orange angular-swagger-ui - v0.6.2
* Orange angular-swagger-ui - v0.6.3
*
* (C) 2015 Orange, all right reserved
* MIT Licensed
Expand All @@ -343,7 +343,7 @@ angular
};
});
/*
* Orange angular-swagger-ui - v0.6.2
* Orange angular-swagger-ui - v0.6.3
*
* (C) 2015 Orange, all right reserved
* MIT Licensed
Expand All @@ -369,7 +369,7 @@ angular
};
}]);
/*
* Orange angular-swagger-ui - v0.6.2
* Orange angular-swagger-ui - v0.6.3
*
* (C) 2015 Orange, all right reserved
* MIT Licensed
Expand Down Expand Up @@ -535,7 +535,7 @@ angular

}]);
/*
* Orange angular-swagger-ui - v0.6.2
* Orange angular-swagger-ui - v0.6.3
*
* (C) 2015 Orange, all right reserved
* MIT Licensed
Expand Down Expand Up @@ -628,7 +628,7 @@ angular

}]);
/*
* Orange angular-swagger-ui - v0.6.2
* Orange angular-swagger-ui - v0.6.3
*
* (C) 2015 Orange, all right reserved
* MIT Licensed
Expand Down Expand Up @@ -674,7 +674,7 @@ angular

}]);
/*
* Orange angular-swagger-ui - v0.6.2
* Orange angular-swagger-ui - v0.6.3
*
* (C) 2015 Orange, all right reserved
* MIT Licensed
Expand Down Expand Up @@ -732,8 +732,8 @@ angular
schema = angular.copy(schema);
angular.forEach(schema.allOf, function(def) {
var ref = resolveReference(openApiSpec, def);
if (!ref.discriminator) {
// do not handle inhertited properties here
if (!def.$ref || !ref.discriminator) {
// do not handle inherited properties here
angular.merge(schema, ref);
}
});
Expand Down Expand Up @@ -882,36 +882,40 @@ angular
* generates new inline model name
*/
function getInlineModelName() {
var name = INLINE_MODEL_NAME + (countInLineModels++);
return name;
return INLINE_MODEL_NAME + (countInLineModels++);
}

/**
* identify models using inheritance
*/
this.resolveInheritance = function(openApiSpec) {
angular.forEach(openApiSpec.definitions, function(schema, modelName) {
if (schema.discriminator) {
schema.subModelsRef = [];
angular.forEach(openApiSpec.definitions, function(subSchema, subModelName) {
if (schema !== subSchema && subSchema.allOf) {
angular.forEach(subSchema.allOf, function(parent) {
if (parent.$ref && modelName === getClassName(parent)) {
subSchema.parentModelsRef = subSchema.parentModelsRef || [];
subSchema.parentModelsRef.push({
'$ref': '#/definitions/' + modelName
});
schema.subModelsRef.push({
'$ref': '#/definitions/' + subModelName
});
}
});
}
});
}
resolveItemInheritance(openApiSpec, schema, schema, modelName);
});
};

function resolveItemInheritance(openApiSpec, schema, def, modelName) {
if (def.discriminator && !schema.subModelsRef) {
schema.subModelsRef = [];
angular.forEach(openApiSpec.definitions, function(subSchema, subModelName) {
if (modelName !== subModelName && subSchema.allOf) {
angular.forEach(subSchema.allOf, function(parent) {
if (parent.$ref && modelName === getClassName(parent)) {
subSchema.parentModelsRef = subSchema.parentModelsRef || [];
subSchema.parentModelsRef.push({
'$ref': '#/definitions/' + modelName
});
schema.subModelsRef.push({
'$ref': '#/definitions/' + subModelName
});
}
resolveItemInheritance(openApiSpec, subSchema, parent, subModelName);
});
}
});
}
}

/**
* generate a model and its submodels from schema
*/
Expand All @@ -927,7 +931,7 @@ angular
if (schema.properties) {
// if inline model
subModels[getInlineModelName()] = schema;
subModels = angular.merge(subModels, findAllModels(openApiSpec, schema, subModelIds));
angular.merge(subModels, findAllModels(openApiSpec, schema, subModelIds));
} else {
subModels = findAllModels(openApiSpec, schema, subModelIds);
}
Expand Down Expand Up @@ -1150,7 +1154,7 @@ angular

}]);
/*
* Orange angular-swagger-ui - v0.6.2
* Orange angular-swagger-ui - v0.6.3
*
* (C) 2015 Orange, all right reserved
* MIT Licensed
Expand Down Expand Up @@ -1232,7 +1236,7 @@ angular
}]);

/*
* Orange angular-swagger-ui - v0.6.2
* Orange angular-swagger-ui - v0.6.3
*
* (C) 2015 Orange, all right reserved
* MIT Licensed
Expand Down Expand Up @@ -1575,7 +1579,7 @@ angular
swaggerModules.add(swaggerModules.PARSE, swaggerParser, 1);
}]);
/*
* Orange angular-swagger-ui - v0.6.2
* Orange angular-swagger-ui - v0.6.3
*
* (C) 2015 Orange, all right reserved
* MIT Licensed
Expand Down
4 changes: 2 additions & 2 deletions dist/scripts/swagger-ui.min.js
View file

Large diffs are not rendered by default.

0 comments on commit 211a0e8

Please sign in to comment.