diff --git a/dist/css/print.css b/dist/css/print.css index 8a54e0e7..8bfe437d 100644 --- a/dist/css/print.css +++ b/dist/css/print.css @@ -819,6 +819,9 @@ outline: 2px solid black; outline-color: #cc0000; } +.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form select[name='parameterContentType'] { + max-width: 300px; +} .swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre { font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace; padding: 10px; diff --git a/dist/css/screen.css b/dist/css/screen.css index e8f024a5..6fcbf839 100644 --- a/dist/css/screen.css +++ b/dist/css/screen.css @@ -819,6 +819,9 @@ outline: 2px solid black; outline-color: #cc0000; } +.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form select[name='parameterContentType'] { + max-width: 300px; +} .swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre { font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace; padding: 10px; diff --git a/dist/lang/zh-cn.js b/dist/lang/zh-cn.js new file mode 100644 index 00000000..570319ba --- /dev/null +++ b/dist/lang/zh-cn.js @@ -0,0 +1,53 @@ +'use strict'; + +/* jshint quotmark: double */ +window.SwaggerTranslator.learn({ + "Warning: Deprecated":"警告：已过时", + "Implementation Notes":"实现备注", + "Response Class":"响应类", + "Status":"状态", + "Parameters":"参数", + "Parameter":"参数", + "Value":"值", + "Description":"描述", + "Parameter Type":"参数类型", + "Data Type":"数据类型", + "Response Messages":"响应消息", + "HTTP Status Code":"HTTP状态码", + "Reason":"原因", + "Response Model":"响应模型", + "Request URL":"请求URL", + "Response Body":"响应体", + "Response Code":"响应码", + "Response Headers":"响应头", + "Hide Response":"隐藏响应", + "Headers":"头", + "Try it out!":"试一下！", + "Show/Hide":"显示/隐藏", + "List Operations":"显示操作", + "Expand Operations":"展开操作", + "Raw":"原始", + "can't parse JSON. Raw result":"无法解析JSON. 原始结果", + "Model Schema":"模型架构", + "Model":"模型", + "apply":"应用", + "Username":"用户名", + "Password":"密码", + "Terms of service":"服务条款", + "Created by":"创建者", + "See more at":"查看更多：", + "Contact the developer":"联系开发者", + "api version":"api版本", + "Response Content Type":"响应Content Type", + "fetching resource":"正在获取资源", + "fetching resource list":"正在获取资源列表", + "Explore":"浏览", + "Show Swagger Petstore Example Apis":"显示 Swagger Petstore 示例 Apis", + "Can't read from server. It may not have the appropriate access-control-origin settings.":"无法从服务器读取。可能没有正确设置access-control-origin。", + "Please specify the protocol for":"请指定协议：", + "Can't read swagger JSON from":"无法读取swagger JSON于", + "Finished Loading Resource Information. Rendering Swagger UI":"已加载资源信息。正在渲染Swagger UI", + "Unable to read api":"无法读取api", + "from path":"从路径", + "server returned":"服务器返回" +}); diff --git a/lang/zh-cn.js b/lang/zh-cn.js new file mode 100644 index 00000000..570319ba --- /dev/null +++ b/lang/zh-cn.js @@ -0,0 +1,53 @@ +'use strict'; + +/* jshint quotmark: double */ +window.SwaggerTranslator.learn({ + "Warning: Deprecated":"警告：已过时", + "Implementation Notes":"实现备注", + "Response Class":"响应类", + "Status":"状态", + "Parameters":"参数", + "Parameter":"参数", + "Value":"值", + "Description":"描述", + "Parameter Type":"参数类型", + "Data Type":"数据类型", + "Response Messages":"响应消息", + "HTTP Status Code":"HTTP状态码", + "Reason":"原因", + "Response Model":"响应模型", + "Request URL":"请求URL", + "Response Body":"响应体", + "Response Code":"响应码", + "Response Headers":"响应头", + "Hide Response":"隐藏响应", + "Headers":"头", + "Try it out!":"试一下！", + "Show/Hide":"显示/隐藏", + "List Operations":"显示操作", + "Expand Operations":"展开操作", + "Raw":"原始", + "can't parse JSON. Raw result":"无法解析JSON. 原始结果", + "Model Schema":"模型架构", + "Model":"模型", + "apply":"应用", + "Username":"用户名", + "Password":"密码", + "Terms of service":"服务条款", + "Created by":"创建者", + "See more at":"查看更多：", + "Contact the developer":"联系开发者", + "api version":"api版本", + "Response Content Type":"响应Content Type", + "fetching resource":"正在获取资源", + "fetching resource list":"正在获取资源列表", + "Explore":"浏览", + "Show Swagger Petstore Example Apis":"显示 Swagger Petstore 示例 Apis", + "Can't read from server. It may not have the appropriate access-control-origin settings.":"无法从服务器读取。可能没有正确设置access-control-origin。", + "Please specify the protocol for":"请指定协议：", + "Can't read swagger JSON from":"无法读取swagger JSON于", + "Finished Loading Resource Information. Rendering Swagger UI":"已加载资源信息。正在渲染Swagger UI", + "Unable to read api":"无法读取api", + "from path":"从路径", + "server returned":"服务器返回" +}); diff --git a/package.json b/package.json index 96fea45a..17160185 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ } ], "description": "Swagger UI is a dependency-free collection of HTML, JavaScript, and CSS assets that dynamically generate beautiful documentation from a Swagger-compliant API", - "version": "2.1.2", + "version": "2.1.3", "homepage": "http://swagger.io", "license": "Apache-2.0", "main": "dist/swagger-ui.js", @@ -50,6 +50,6 @@ "less": "^2.4.0", "mocha": "^2.1.0", "selenium-webdriver": "^2.45.0", - "swagger-client": "2.1.3" + "swagger-client": "2.1.5" } } diff --git a/src/main/html/css/print.css b/src/main/html/css/print.css index 8a54e0e7..8bfe437d 100644 --- a/src/main/html/css/print.css +++ b/src/main/html/css/print.css @@ -819,6 +819,9 @@ outline: 2px solid black; outline-color: #cc0000; } +.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form select[name='parameterContentType'] { + max-width: 300px; +} .swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre { font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace; padding: 10px; diff --git a/src/main/html/css/screen.css b/src/main/html/css/screen.css index e8f024a5..6fcbf839 100644 --- a/src/main/html/css/screen.css +++ b/src/main/html/css/screen.css @@ -819,6 +819,9 @@ outline: 2px solid black; outline-color: #cc0000; } +.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form select[name='parameterContentType'] { + max-width: 300px; +} .swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre { font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace; padding: 10px; diff --git a/src/main/javascript/view/OperationView.js b/src/main/javascript/view/OperationView.js index 72672d19..2b87f55d 100644 --- 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); } }, diff --git a/src/main/less/specs.less b/src/main/less/specs.less index ed9f6cbe..991528e9 100644 --- a/src/main/less/specs.less +++ b/src/main/less/specs.less @@ -757,6 +757,9 @@ outline: 2px solid black; outline-color: #cc0000; } + select[name='parameterContentType'] { + max-width:300px; + } } div.response { div.block { @@ -1117,4 +1120,4 @@ } } -} \ No newline at end of file +} diff --git a/test/e2e/servers.js b/test/e2e/servers.js index 4e4d1976..66387c2a 100644 --- a/test/e2e/servers.js +++ b/test/e2e/servers.js @@ -28,8 +28,12 @@ module.exports.start = function (specsLocation, done) { setTimeout(function(){ driver.get(url); - done(); + setTimeout(function() { + done(); + }, 2000); + console.log('waiting for UI to load'); }, process.env.TRAVIS ? 20000 : 5000); + console.log('waiting for server to start'); }; module.exports.close = function() { diff --git a/test/e2e/v1.js b/test/e2e/v1.js index 32f1b6e8..44c4a8fb 100644 --- a/test/e2e/v1.js +++ b/test/e2e/v1.js @@ -96,7 +96,8 @@ describe('swagger 1.x spec tests', function () { }); }); - after(function(){ + after(function(done){ servers.close(); + done(); }); }); diff --git a/test/e2e/v2.js b/test/e2e/v2.js index af5c7f30..9da7a3a5 100644 --- a/test/e2e/v2.js +++ b/test/e2e/v2.js @@ -17,10 +17,10 @@ var elements = [ ]; describe('swagger 2.0 spec tests', function () { - this.timeout(10 * 1000); + this.timeout(40 * 1000); before(function (done) { - this.timeout(25 * 1000); + this.timeout(50 * 1000); servers.start('/v2/petstore.json', done); }); @@ -110,6 +110,7 @@ describe('swagger 2.0 spec tests', function () { }); }); +<<<<<<< HEAD ['root.id','root.username','root.firstName','root.lastName', 'root.email', 'root.password', 'root.phone', 'root.userStatus'] .forEach(function (id) { it('should find a jsoneditor for user post with field: ' + id, function (done) { @@ -122,7 +123,8 @@ describe('swagger 2.0 spec tests', function () { // TODO JSonEditor Tests for POST/PUT - after(function() { + after(function(done) { servers.close(); + done(); }); });