Merge branch 'issue-1807'

This commit is contained in:
Tony Tam
2015-12-11 11:17:24 -08:00
4 changed files with 29 additions and 29 deletions

6
dist/swagger-ui.js vendored
View File

@@ -158,14 +158,15 @@ window.Docs = {
$('#'+li_dom_id).slideto({highlight: false}); $('#'+li_dom_id).slideto({highlight: false});
break; break;
} }
}, },
toggleEndpointListForResource: function(resource) { toggleEndpointListForResource: function(resource) {
var elem = $('li#resource_' + Docs.escapeResourceName(resource) + ' ul.endpoints'); var elem = $('li#resource_' + Docs.escapeResourceName(resource) + ' ul.endpoints');
if (elem.is(':visible')) { if (elem.is(':visible')) {
$.bbq.pushState('#/', 2);
Docs.collapseEndpointListForResource(resource); Docs.collapseEndpointListForResource(resource);
} else { } else {
$.bbq.pushState('#/' + resource, 2);
Docs.expandEndpointListForResource(resource); Docs.expandEndpointListForResource(resource);
} }
}, },
@@ -25839,11 +25840,10 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
toggleOperationContent: function (event) { toggleOperationContent: function (event) {
var elem = $('#' + Docs.escapeResourceName(this.parentId + '_' + this.nickname + '_content')); var elem = $('#' + Docs.escapeResourceName(this.parentId + '_' + this.nickname + '_content'));
if (elem.is(':visible')){ if (elem.is(':visible')){
event.preventDefault();
$.bbq.pushState('#/', 2); $.bbq.pushState('#/', 2);
event.preventDefault();
Docs.collapseOperation(elem); Docs.collapseOperation(elem);
} else { } else {
event.preventDefault();
Docs.expandOperation(elem); Docs.expandOperation(elem);
} }
}, },

File diff suppressed because one or more lines are too long

View File

@@ -117,14 +117,15 @@ window.Docs = {
$('#'+li_dom_id).slideto({highlight: false}); $('#'+li_dom_id).slideto({highlight: false});
break; break;
} }
}, },
toggleEndpointListForResource: function(resource) { toggleEndpointListForResource: function(resource) {
var elem = $('li#resource_' + Docs.escapeResourceName(resource) + ' ul.endpoints'); var elem = $('li#resource_' + Docs.escapeResourceName(resource) + ' ul.endpoints');
if (elem.is(':visible')) { if (elem.is(':visible')) {
$.bbq.pushState('#/', 2);
Docs.collapseEndpointListForResource(resource); Docs.collapseEndpointListForResource(resource);
} else { } else {
$.bbq.pushState('#/' + resource, 2);
Docs.expandEndpointListForResource(resource); Docs.expandEndpointListForResource(resource);
} }
}, },

View File

@@ -678,11 +678,10 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
toggleOperationContent: function (event) { toggleOperationContent: function (event) {
var elem = $('#' + Docs.escapeResourceName(this.parentId + '_' + this.nickname + '_content')); var elem = $('#' + Docs.escapeResourceName(this.parentId + '_' + this.nickname + '_content'));
if (elem.is(':visible')){ if (elem.is(':visible')){
event.preventDefault();
$.bbq.pushState('#/', 2); $.bbq.pushState('#/', 2);
event.preventDefault();
Docs.collapseOperation(elem); Docs.collapseOperation(elem);
} else { } else {
event.preventDefault();
Docs.expandOperation(elem); Docs.expandOperation(elem);
} }
}, },