kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into JSONEditorMaster

Browse Source 
Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
This commit is contained in:
Laurent Lepinay
2015-11-13 13:42:46 +01:00
parent 57055ffc18 257db60a0b
commit 51b7b1db39
14 changed files with 1213 additions and 900 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/javascript/view/OperationView.js
View File

@@ -358,7 +358,7 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
opts.useJQuery = true;
map.parameterContentType = 'multipart/form-data';
this.map = map;
return this.model.execute(map, opts, this.showCompleteStatus, this.showErrorStatus, this);
} else {
this.map = map;
@@ -676,7 +676,7 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
//adds curl output
var curlCommand = this.model.asCurl(this.map);
curlCommand = curlCommand.replace('!', '!');
$( '.curl', $(this.el)).html('<pre>' + curlCommand + '</pre>');
$( 'div.curl', $(this.el)).html('<pre>' + curlCommand + '</pre>');
// only highlight the response if response is less than threshold, default state is highlight response
var opts = this.options.swaggerOptions;