Merge branch 'JSONEditor' into JSONEditorMaster

Conflicts:
	dist/swagger-ui.js
	dist/swagger-ui.min.js
	src/main/less/screen.less
This commit is contained in:
unknown
2015-09-10 10:53:15 +02:00
49 changed files with 2904 additions and 2546 deletions
@@ -56,6 +56,10 @@ SwaggerUi.Views.SignatureView = Backbone.View.extend({
// Fix for bug in IE 10/11 which causes placeholder text to be copied to "value"
if ($.trim(textArea.val()) === '' || textArea.prop('placeholder') === textArea.val()) {
textArea.val(this.model.sampleJSON);
// TODO move this code outside of the view and expose an event instead
if( this.model.jsonEditor && this.model.jsonEditor.isEnabled()){
this.model.jsonEditor.setValue(JSON.parse(this.model.sampleJSON));
}
}
}
}