Merge pull request swagger-api#960 from mohsen1/develop_2.0

Set marked options to render GFM correctly and fix swagger-api#700
roboconf · Feb 26, 2015 · 23e0c64 · 23e0c64
2 parents a6a1d8c + a56bdb9
commit 23e0c64
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -118,7 +118,7 @@ gulp.task('copy', ['less'], function() {
  * Watch for changes and recompile
  */
 gulp.task('watch', function() {
-  return watch(['./src/**/*.{coffee,js,less}'], function() {
+  return watch(['./src/**/*.{coffee,js,less,handlebars}'], function() {
     gulp.start('default');
   });
 });

diff --git a/src/main/coffeescript/SwaggerUi.coffee b/src/main/coffeescript/SwaggerUi.coffee
@@ -24,11 +24,14 @@ class SwaggerUi extends Backbone.Router
 
     @options = options
 
+    # set marked options
+    marked.setOptions(gfm: true)
+
     # Set the callbacks
-    @options.success = => 
+    @options.success = =>
       @render()
     @options.progress = (d) => @showMessage(d)
-    @options.failure = (d) => 
+    @options.failure = (d) =>
       @onLoadFailure(d)
 
     # Create view to handle the header inputs

diff --git a/src/main/template/param_list.handlebars b/src/main/template/param_list.handlebars
@@ -1,3 +1,6 @@
+{{#if required}}
+<td class='code required'>{{name}}</td>
+{{/if}}
 <td class='code'>{{name}}</td>
 <td>
   <select {{#isArray this}} multiple='multiple'{{/isArray}} class='parameter' name='{{name}}'>