Merge branch 'master' of github.com:pose/swagger-ui

Conflicts:
	lib/swagger.js

src/main/coffeescript/SwaggerUi.coffee

@@ -1,73 +1,78 @@
-class SwaggerUi extends Backbone.Router
-
-  # Defaults
-  dom_id: "swagger_ui"
-
-  # Attributes
-  options: null
-  api: null
-  headerView: null
-  mainView: null
-
-  # SwaggerUi accepts all the same options as SwaggerApi
-  initialize: (options={}) ->
-    # Allow dom_id to be overridden
-    if options.dom_id?
-      @dom_id = options.dom_id
-      delete options.dom_id
-
-    # Create an empty div which contains the dom_id
-    $('body').append('<div id="' + @dom_id + '"></div>') if not $('#' + @dom_id)?
-
-    @options = options
-
-    # Set the callbacks
-    @options.success = => @render()
-    @options.progress = (d) => @showMessage(d)
-    @options.failure = (d) => @onLoadFailure(d)
-
-    # Create view to handle the header inputs
-    @headerView = new HeaderView({el: $('#header')})
-
-    # Event handler for when the baseUrl/apiKey is entered by user
-    @headerView.on 'update-swagger-ui', (data) => @updateSwaggerUi(data)
-
-  # Event handler for when url/key is received from user
-  updateSwaggerUi: (data) ->
-    @options.discoveryUrl = data.discoveryUrl
-    @options.apiKey = data.apiKey
-    @load()
-
-  # Create an api and render
-  load: ->
-    # Initialize the API object
-    @mainView?.clear()
-    @headerView.update(@options.discoveryUrl, @options.apiKey)
-    @api = new SwaggerApi(@options)
-
-  # This is bound to success handler for SwaggerApi
-  #  so it gets called when SwaggerApi completes loading
-  render: ->
-    @showMessage('Finished Loading Resource Information. Rendering Swagger UI...')
-    @mainView = new MainView({model: @api, el: $('#' + @dom_id)}).render()
-    @showMessage()
-    setTimeout(
-      =>
-        Docs.shebang()
-      400
-    )
-
-  # Shows message on topbar of the ui
-  showMessage: (data = '') ->
-    $('#message-bar').removeClass 'message-fail'
-    $('#message-bar').addClass 'message-success'
-    $('#message-bar').html data
-
-  # shows message in red
-  onLoadFailure: (data = '') ->
-    $('#message-bar').removeClass 'message-success'
-    $('#message-bar').addClass 'message-fail'
-    $('#message-bar').html data
-
-
-window.SwaggerUi = SwaggerUi
+class SwaggerUi extends Backbone.Router
+
+  # Defaults
+  dom_id: "swagger_ui"
+
+  # Attributes
+  options: null
+  api: null
+  headerView: null
+  mainView: null
+
+  # SwaggerUi accepts all the same options as SwaggerApi
+  initialize: (options={}) ->
+    # Allow dom_id to be overridden
+    if options.dom_id?
+      @dom_id = options.dom_id
+      delete options.dom_id
+
+    # Create an empty div which contains the dom_id
+    $('body').append('<div id="' + @dom_id + '"></div>') if not $('#' + @dom_id)?
+
+    @options = options
+
+    # Set the callbacks
+    @options.success = => @render()
+    @options.progress = (d) => @showMessage(d)
+    @options.failure = (d) => @onLoadFailure(d)
+
+    # Create view to handle the header inputs
+    @headerView = new HeaderView({el: $('#header')})
+
+    # Event handler for when the baseUrl/apiKey is entered by user
+    @headerView.on 'update-swagger-ui', (data) => @updateSwaggerUi(data)
+
+  # Event handler for when url/key is received from user
+  updateSwaggerUi: (data) ->
+    @options.discoveryUrl = data.discoveryUrl
+    @options.apiKey = data.apiKey
+    @load()
+
+  # Create an api and render
+  load: ->
+    # Initialize the API object
+    @mainView?.clear()
+    @headerView.update(@options.discoveryUrl, @options.apiKey)
+    @api = new SwaggerApi(@options)
+
+  # This is bound to success handler for SwaggerApi
+  #  so it gets called when SwaggerApi completes loading
+  render:() ->
+    @showMessage('Finished Loading Resource Information. Rendering Swagger UI...')
+    @mainView = new MainView({model: @api, el: $('#' + @dom_id)}).render()
+    @showMessage()
+    switch @options.docExpansion
+     when "full" then Docs.expandOperationsForResource('')
+     when "list" then Docs.collapseOperationsForResource('')
+    @options.onComplete(@api, @) if @options.onComplete
+    setTimeout(
+      =>
+        Docs.shebang()
+      400
+    )
+
+  # Shows message on topbar of the ui
+  showMessage: (data = '') ->
+    $('#message-bar').removeClass 'message-fail'
+    $('#message-bar').addClass 'message-success'
+    $('#message-bar').html data
+
+  # shows message in red
+  onLoadFailure: (data = '') ->
+    $('#message-bar').removeClass 'message-success'
+    $('#message-bar').addClass 'message-fail'
+    val = $('#message-bar').html data
+    @options.onFailure(data) if @options.onFailure?
+    val
+
+window.SwaggerUi = SwaggerUi

src/main/coffeescript/view/OperationView.coffee

@@ -86,7 +86,7 @@ class OperationView extends Backbone.View
         complete: (data) =>
           @showCompleteStatus(data)
 
-      obj.contentType = "application/json" if (obj.type.toLowerCase() == "post" or obj.type.toLowerCase() == "put" or obj.type.toLowerCase() == "patch")
+      obj.contentType = "application/json" if (obj.type.toLowerCase() == "put" or obj.type.toLowerCase() == "patch")
     
       jQuery.ajax(obj)
       false

src/main/coffeescript/view/ParameterView.coffee

@@ -6,6 +6,7 @@ class ParameterView extends Backbone.View
 
     template = @template()
     $(@el).html(template(@model))
+
     @
 
   # Return an appropriate template based on if the parameter is a list, readonly, required