Skip to content

Commit cb8ac66

Browse files
sloriasloria
authored
Merge pull request jmcarp#82 from paxnovem/issue-76
[Issue 76] Upgrading swagger-ui version
2 parents 44ca23a + d7b4933 commit cb8ac66

File tree

4 files changed

+29
-51
lines changed

4 files changed

+29
-51
lines changed

‎flask_apispec/templates/swagger-ui.html

Lines changed: 21 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,54 +3,32 @@
33
<head>
44
<meta charset="UTF-8">
55
<title>Swagger UI</title>
6-
<link rel="icon" type="image/png" href="{{ url_for('flask-apispec.static', filename='images/favicon-32x32.png') }}" sizes="32x32" />
7-
<link rel="icon" type="image/png" href="{{ url_for('flask-apispec.static', filename='images/favicon-16x16.png') }}" sizes="16x16" />
8-
9-
<link href="{{ url_for('flask-apispec.static', filename='css/typography.css') }}" media='screen' rel="stylesheet" type="text/css"/>
10-
<link href="{{ url_for('flask-apispec.static', filename='css/reset.css') }}" media='screen' rel="stylesheet" type="text/css"/>
11-
<link href="{{ url_for('flask-apispec.static', filename='css/screen.css') }}" media='screen' rel="stylesheet" type="text/css"/>
12-
<link href="{{ url_for('flask-apispec.static', filename='css/reset.css') }}" media='print' rel="stylesheet" type="text/css"/>
13-
<link href="{{ url_for('flask-apispec.static', filename='css/print.css') }}" media='print' rel="stylesheet" type="text/css"/>
14-
15-
<script src="{{ url_for('flask-apispec.static', filename='lib/jquery-1.8.0.min.js') }}" type="text/javascript"></script>
16-
<script src="{{ url_for('flask-apispec.static', filename='lib/jquery.slideto.min.js') }}" type="text/javascript"></script>
17-
<script src="{{ url_for('flask-apispec.static', filename='lib/jquery.wiggle.min.js') }}" type="text/javascript"></script>
18-
<script src="{{ url_for('flask-apispec.static', filename='lib/jquery.ba-bbq.min.js') }}" type="text/javascript"></script>
19-
<script src="{{ url_for('flask-apispec.static', filename='lib/handlebars-2.0.0.js') }}" type="text/javascript"></script>
20-
<script src="{{ url_for('flask-apispec.static', filename='lib/underscore-min.js') }}" type="text/javascript"></script>
21-
<script src="{{ url_for('flask-apispec.static', filename='lib/backbone-min.js') }}" type="text/javascript"></script>
22-
<script src="{{ url_for('flask-apispec.static', filename='swagger-ui.js') }}" type="text/javascript"></script>
23-
<script src="{{ url_for('flask-apispec.static', filename='lib/highlight.7.3.pack.js') }}" type="text/javascript"></script>
24-
<script src="{{ url_for('flask-apispec.static', filename='lib/marked.js') }}" type="text/javascript"></script>
25-
<script src="{{ url_for('flask-apispec.static', filename='lib/swagger-oauth.js') }}" type="text/javascript"></script>
26-
27-
<script type="text/javascript">
28-
$(function () {
29-
window.swaggerUi = new SwaggerUi({
30-
url: '{{ url_for('flask-apispec.swagger-json') }}',
31-
dom_id: 'swagger-ui-container',
32-
supportedSubmitMethods: ['get', 'post', 'put', 'delete', 'patch'],
33-
onComplete: function(swaggerApi, swaggerUi) {
34-
$('pre code').each(function(i, e) {
35-
hljs.highlightBlock(e)
36-
});
37-
},
38-
onFailure: function(data) {
39-
console.log('Unable to Load SwaggerUI');
40-
},
41-
docExpansion: 'none',
42-
apisSorter: 'alpha',
43-
showRequestHeaders: false
44-
});
45-
46-
window.swaggerUi.load();
47-
});
48-
</script>
6+
<link rel="icon" type="image/png" href="{{ url_for('flask-apispec.static', filename='favicon-32x32.png') }}" sizes="32x32" />
7+
<link rel="icon" type="image/png" href="{{ url_for('flask-apispec.static', filename='favicon-16x16.png') }}" sizes="16x16" />
8+
<link href="{{ url_for('flask-apispec.static', filename='swagger-ui.css') }}" rel="stylesheet" type="text/css"/>
499
</head>
5010

5111
<body class="swagger-section">
5212
<div id="message-bar" class="swagger-ui-wrap" data-sw-translate>&nbsp;</div>
5313
<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
14+
<script src="{{ url_for('flask-apispec.static', filename='swagger-ui-bundle.js') }}" type="text/javascript"></script>
15+
<script src="{{ url_for('flask-apispec.static', filename='swagger-ui-standalone-preset.js') }}" type="text/javascript"></script>
16+
<script type="text/javascript">
17+
var ui = SwaggerUIBundle({
18+
url: "{{ url_for('flask-apispec.swagger-json') }}",
19+
dom_id: '#swagger-ui-container',
20+
deepLinking: true,
21+
presets: [
22+
SwaggerUIBundle.presets.apis,
23+
SwaggerUIStandalonePreset
24+
],
25+
plugins: [
26+
SwaggerUIBundle.plugins.DownloadUrl
27+
],
28+
layout: "BaseLayout"
29+
})
30+
window.ui = ui
31+
</script>
5432
</body>
5533

5634
</html>

‎package-lock.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "flask-apispec",
3-
"version": "0.3.1",
3+
"version": "0.6.0",
44
"dependencies": {
5-
"swagger-ui": "2.1.3"
5+
"swagger-ui-dist": "3.9.3"
66
},
77
"repository": {
88
"type": "git",

‎tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def clean(ctx):
1818
def install(ctx):
1919
ctx.run('npm install')
2020
ctx.run('rm -rf flask_apispec/static')
21-
ctx.run('cp -r node_modules/swagger-ui/dist flask_apispec/static')
21+
ctx.run('cp -r node_modules/swagger-ui-dist flask_apispec/static')
2222

2323
@task
2424
def clean_docs(ctx):

0 commit comments

Comments
 (0)