diff --git a/dist/swagger-ui.js b/dist/swagger-ui.js
index 05406f2f..da8c78f9 100644
--- a/dist/swagger-ui.js
+++ b/dist/swagger-ui.js
@@ -27127,7 +27127,7 @@ SwaggerUi.partials.signature = (function () {
}
function getInfiniteLoopMessage (name) {
- return '';
+ return '';
}
function getErrorMessage () {
@@ -27135,7 +27135,10 @@ SwaggerUi.partials.signature = (function () {
}
function createSchemaXML (name, definition, models, config) {
- var $ref = definition.$ref;
+ var $ref = _.isObject(definition) ? definition.$ref : null;
+ var output, index;
+ config = config || {};
+ config.modelsToIgnore = config.modelsToIgnore || [];
var descriptor = _.isString($ref) ? getDescriptorByRef($ref, models, config)
: getDescriptor(name, definition, models, config);
@@ -27145,14 +27148,23 @@ SwaggerUi.partials.signature = (function () {
switch (descriptor.type) {
case 'array':
- return createArrayXML(descriptor);
+ output = createArrayXML(descriptor); break;
case 'object':
- return createObjectXML(descriptor);
+ output = createObjectXML(descriptor); break;
case 'loop':
- return getInfiniteLoopMessage(descriptor.name);
+ output = getInfiniteLoopMessage(descriptor.name); break;
default:
- return createPrimitiveXML(descriptor);
+ output = createPrimitiveXML(descriptor);
}
+
+ if ($ref) {
+ index = config.modelsToIgnore.indexOf($ref);
+ if (index > -1) {
+ config.modelsToIgnore.splice(index, 1);
+ }
+ }
+
+ return output;
}
function Descriptor (name, type, definition, models, config) {
@@ -27174,12 +27186,10 @@ SwaggerUi.partials.signature = (function () {
var name = model.name || modelType;
var type = model.type || 'object';
- config = config || {};
- config.modelsToIgnore = config.modelsToIgnore || [];
- if (config.modelsToIgnore.indexOf(name) > -1) {
+ if (config.modelsToIgnore.indexOf($ref) > -1) {
type = 'loop';
} else {
- config.modelsToIgnore.push(modelType);
+ config.modelsToIgnore.push($ref);
}
if (!model.definition) {
diff --git a/dist/swagger-ui.min.js b/dist/swagger-ui.min.js
index 1548b023..4b08aa3e 100644
--- a/dist/swagger-ui.min.js
+++ b/dist/swagger-ui.min.js
@@ -1,11 +1,11 @@
(function(){function e(){e.history=e.history||[],e.history.push(arguments),this.console&&console.log(Array.prototype.slice.call(arguments)[0])}this.Handlebars=this.Handlebars||{},this.Handlebars.templates=this.Handlebars.templates||{},this.Handlebars.templates.apikey_button_view=Handlebars.template({compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,r){var i,a="function",o=t.helperMissing,s=this.escapeExpression;return"\n
\n"},useData:!0}),this.Handlebars.templates.basic_auth_button_view=Handlebars.template({compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,r){return'\n\n\n'},useData:!0}),this.Handlebars.templates.content_type=Handlebars.template({1:function(e,t,n,r){var i,a="";return i=t.each.call(e,null!=e?e.produces:e,{name:"each",hash:{},fn:this.program(2,r),inverse:this.noop,data:r}),null!=i&&(a+=i),a},2:function(e,t,n,r){var i=this.lambda,a=this.escapeExpression;return' \n"},4:function(e,t,n,r){return' \n'},compiler:[6,">= 2.0.0-beta.1"],main:function(e,t,n,r){var i,a,o="function",s=t.helperMissing,u=this.escapeExpression,l='\n\n"},useData:!0}),$(function(){$.fn.vAlign=function(){return this.each(function(){var e=$(this).height(),t=$(this).parent().height(),n=(t-e)/2;$(this).css("margin-top",n)})},$.fn.stretchFormtasticInputWidthToParent=function(){return this.each(function(){var e=$(this).closest("form").innerWidth(),t=parseInt($(this).closest("form").css("padding-left"),10)+parseInt($(this).closest("form").css("padding-right"),10),n=parseInt($(this).css("padding-left"),10)+parseInt($(this).css("padding-right"),10);$(this).css("width",e-t-n)})},$("form.formtastic li.string input, form.formtastic textarea").stretchFormtasticInputWidthToParent(),$("ul.downplayed li div.content p").vAlign(),$("form.sandbox").submit(function(){var e=!0;return $(this).find("input.required").each(function(){$(this).removeClass("error"),""===$(this).val()&&($(this).addClass("error"),$(this).wiggle(),e=!1)}),e})}),Function.prototype.bind&&console&&"object"==typeof console.log&&["log","info","warn","error","assert","dir","clear","profile","profileEnd"].forEach(function(e){console[e]=this.bind(console[e],console)},Function.prototype.call),window.Docs={shebang:function(){var e=$.param.fragment().split("/");switch(e.shift(),e.length){case 1:if(e[0].length>0){var t="resource_"+e[0];Docs.expandEndpointListForResource(e[0]),$("#"+t).slideto({highlight:!1})}break;case 2:Docs.expandEndpointListForResource(e[0]),$("#"+t).slideto({highlight:!1});var n=e.join("_"),r=n+"_content";Docs.expandOperation($("#"+r)),$("#"+n).slideto({highlight:!1})}},toggleEndpointListForResource:function(e){var t=$("li#resource_"+Docs.escapeResourceName(e)+" ul.endpoints");t.is(":visible")?($.bbq.pushState("#/",2),Docs.collapseEndpointListForResource(e)):($.bbq.pushState("#/"+e,2),Docs.expandEndpointListForResource(e))},expandEndpointListForResource:function(e){var e=Docs.escapeResourceName(e);if(""==e)return void $(".resource ul.endpoints").slideDown();$("li#resource_"+e).addClass("active");var t=$("li#resource_"+e+" ul.endpoints");t.slideDown()},collapseEndpointListForResource:function(e){var e=Docs.escapeResourceName(e);if(""==e)return void $(".resource ul.endpoints").slideUp();$("li#resource_"+e).removeClass("active");var t=$("li#resource_"+e+" ul.endpoints");t.slideUp()},expandOperationsForResource:function(e){return Docs.expandEndpointListForResource(e),""==e?void $(".resource ul.endpoints li.operation div.content").slideDown():void $("li#resource_"+Docs.escapeResourceName(e)+" li.operation div.content").each(function(){Docs.expandOperation($(this))})},collapseOperationsForResource:function(e){return Docs.expandEndpointListForResource(e),""==e?void $(".resource ul.endpoints li.operation div.content").slideUp():void $("li#resource_"+Docs.escapeResourceName(e)+" li.operation div.content").each(function(){Docs.collapseOperation($(this))})},escapeResourceName:function(e){return e.replace(/[!"#$%&'()*+,.\/:;<=>?@\[\\\]\^`{|}~]/g,"\\$&")},expandOperation:function(e){e.slideDown()},collapseOperation:function(e){e.slideUp()}},Handlebars.registerHelper("sanitize",function(e){return e=e.replace(/