Merge remote-tracking branch 'upstream/master' into JSONEditorMaster

Conflicts: dist/swagger-ui.js dist/swagger-ui.min.js test/e2e/v2.js
2015-09-21 14:48:29 +02:00
parent 1a8444c4c0 8bc259558b
commit 1367e8f6fa
12 changed files with 137 additions and 8 deletions
--- a/src/main/javascript/view/OperationView.js
+++ b/src/main/javascript/view/OperationView.js
@@ -701,6 +701,7 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
      $.bbq.pushState('#/', 2);
      Docs.collapseOperation(elem);
    } else {
+      event.preventDefault();
      Docs.expandOperation(elem);
    }
  },