Skip to content

Commit 34d3702

Browse files
#1 Add an URL parameter to configure the rendering for web sockets
1 parent 1fd9e61 commit 34d3702

File tree

7 files changed

+23
-12
lines changed

7 files changed

+23
-12
lines changed

ISSUE_TEMPLATE.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function _dist() {
5454
'./src/generated/templates.js',
5555
'./node_modules/swagger-client/browser/swagger-client.js'
5656
])
57-
.pipe(order(['scripts.js', 'templates.js']))
57+
.pipe(order(['**/javascript/**/*.js', '**/generated/templates.js']))
5858
.pipe(concat('swagger-ui.js'))
5959
.pipe(wrap('(function(){<%= contents %>}).call(this);'))
6060
.pipe(header(banner, { pkg: pkg }))

src/main/javascript/SwaggerUi.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,16 @@ window.SwaggerUi = Backbone.Router.extend({
123123
render: function(){
124124
var authsModel;
125125
this.showMessage('Finished Loading Resource Information. Rendering Swagger UI...');
126+
127+
// VZ: determine whether we display REST or web socket data
128+
this.options.isRest = this.api.info.title.match(/\bREST\b/i) !== null;
129+
130+
// List all the operations for the web socket
131+
if (! this.options.isRest) {
132+
this.options.docExpansion = 'list';
133+
}
134+
// VZ
135+
126136
this.mainView = new SwaggerUi.Views.MainView({
127137
model: this.api,
128138
el: $('#' + this.dom_id),

src/main/javascript/init.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@ $(function () {
1010
/*
1111
** Only for tests! **
1212
** Just copy your "swagger.json" file in the "dist" directory.
13-
13+
1414
else {
15-
url = 'swagger.json';
15+
url = '/swagger.json';
1616
}
17-
1817
*/
1918

2019
// Check there is a valid URL

src/main/javascript/view/OperationView.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,14 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
2020
this.parentId = this.model.parentId;
2121
this.nickname = this.model.nickname;
2222
this.model.encodedParentId = encodeURIComponent(this.parentId);
23+
this.model.isRest = false;
2324

2425
if (opts.swaggerOptions) {
25-
this.model.defaultRendering = opts.swaggerOptions.defaultModelRendering;
26+
// VZ: determine whether we display REST or web socket data
27+
this.model.isRest = opts.swaggerOptions.isRest;
28+
// VZ
2629

30+
this.model.defaultRendering = opts.swaggerOptions.defaultModelRendering;
2731
if (opts.swaggerOptions.showRequestHeaders) {
2832
this.model.showRequestHeaders = true;
2933
}
@@ -83,14 +87,14 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
8387
},
8488

8589
// Note: copied from CoffeeScript compiled file
86-
// TODO: redactor
90+
// TODO: refactor
8791
render: function() {
8892
var a, auth, auths, code, contentTypeModel, isMethodSubmissionSupported, k, key, l, len, len1, len2, len3, len4, m, modelAuths, n, o, p, param, q, ref, ref1, ref2, ref3, ref4, ref5, responseContentTypeView, responseSignatureView, schema, schemaObj, scopeIndex, signatureModel, statusCode, successResponse, type, v, value, produces, isXML, isJSON;
8993
isMethodSubmissionSupported = jQuery.inArray(this.model.method, this.model.supportedSubmitMethods()) >= 0;
9094
if (!isMethodSubmissionSupported) {
9195
this.model.isReadOnly = true;
9296
}
93-
97+
9498
this.model.description = this.model.description || this.model.notes;
9599
this.model.oauth = null;
96100
modelAuths = this.model.authorizations || this.model.security;

src/main/template/main.handlebars

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class='info' id='api_info'>
2-
<div class="info_title">Swagger UI for Roboconf's REST API</div>
2+
<div class="info_title">Swagger UI for Roboconf :: {{info.title}}</div>
33
</div>
44
<div class='container' id='resources_container'>
55
<div class='authorize-wrapper'></div>

src/main/template/operation.handlebars

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@
112112
</table>
113113
{{/if}}
114114
</form>
115+
{{#if isRest}}
115116
<div class='response'>
116117
<h4 class='curl'>Curl</h4>
117118
<div class='block curl-content' style='display:none'></div>
@@ -125,8 +126,8 @@
125126
<div class='block show-curl-content'>
126127
<input class='submit' type='submit' value='Show the CURL command'/>
127128
</div>
128-
129129
</div>
130+
{{/if}}
130131
</div>
131132
</li>
132133
</ul>

0 commit comments

Comments
 (0)