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

Merge pull request #295 from tomrac87/hal_json

Browse Source 
Proper formatting for "application/hal+json" Content-Type
This commit is contained in:
Tony Tam
2013-09-24 06:38:16 -07:00
parent 77882a0e3e ff05f9113b
commit abc3600994
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/swagger-ui.js vendored
View File

@@ -1735,7 +1735,7 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
if (content === void 0) { if (content === void 0) {
code = $('<code />').text("no content"); code = $('<code />').text("no content");
pre = $('<pre class="json" />').append(code); pre = $('<pre class="json" />').append(code);
} else if (contentType.indexOf("application/json") === 0) { } else if (contentType.indexOf("application/json") === 0 || contentType.indexOf("application/hal+json") === 0) {
code = $('<code />').text(JSON.stringify(JSON.parse(content), null, 2)); code = $('<code />').text(JSON.stringify(JSON.parse(content), null, 2));
pre = $('<pre class="json" />').append(code); pre = $('<pre class="json" />').append(code);
} else if (contentType.indexOf("application/xml") === 0) { } else if (contentType.indexOf("application/xml") === 0) {

4
src/main/coffeescript/view/OperationView.coffee
View File

@@ -205,7 +205,7 @@ class OperationView extends Backbone.View
if content == undefined if content == undefined
code = $('<code />').text("no content") code = $('<code />').text("no content")
pre = $('<pre class="json" />').append(code) pre = $('<pre class="json" />').append(code)
else if contentType.indexOf("application/json") == 0 else if contentType.indexOf("application/json") == 0 || contentType.indexOf("application/hal+json") == 0
code = $('<code />').text(JSON.stringify(JSON.parse(content), null, 2)) code = $('<code />').text(JSON.stringify(JSON.parse(content), null, 2))
pre = $('<pre class="json" />').append(code) pre = $('<pre class="json" />').append(code)
else if contentType.indexOf("application/xml") == 0 else if contentType.indexOf("application/xml") == 0
@@ -231,4 +231,4 @@ class OperationView extends Backbone.View
toggleOperationContent: -> toggleOperationContent: ->
elem = $('#' + Docs.escapeResourceName(@model.resourceName) + "_" + @model.nickname + "_" + @model.method + "_" + @model.number + "_content") elem = $('#' + Docs.escapeResourceName(@model.resourceName) + "_" + @model.nickname + "_" + @model.method + "_" + @model.number + "_content")
if elem.is(':visible') then Docs.collapseOperation(elem) else Docs.expandOperation(elem) if elem.is(':visible') then Docs.collapseOperation(elem) else Docs.expandOperation(elem)