kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	dist/swagger-ui.js
#	dist/swagger-ui.min.js
This commit is contained in:
Guido Josquin
2016-05-02 15:06:37 +02:00
parent 918aed94d6 0d1fda51eb
commit 9bbb42eb48
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/swagger-ui.js vendored
View File

@@ -21131,7 +21131,7 @@ SwaggerUi.partials.signature = (function () {
// copy-pasted from swagger-js // copy-pasted from swagger-js
var getInlineModel = function(inlineStr) { var getInlineModel = function(inlineStr) {
if(/^Inline Model \d+$/.test(inlineStr)) { if(/^Inline Model \d+$/.test(inlineStr) && this.inlineModels) {
var id = parseInt(inlineStr.substr('Inline Model'.length).trim(),10); // var id = parseInt(inlineStr.substr('Inline Model'.length).trim(),10); //
var model = this.inlineModels[id]; var model = this.inlineModels[id];
return model; return model;

2
dist/swagger-ui.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
gulpfile.js
View File

@@ -91,7 +91,7 @@ function _less() {
'./src/main/less/style.less' './src/main/less/style.less'
]) ])
.pipe(less()) .pipe(less())
.on('error', log) .on('error', function(err){ log(err); this.emit('end');})
.pipe(gulp.dest('./src/main/html/css/')) .pipe(gulp.dest('./src/main/html/css/'))
.pipe(connect.reload()); .pipe(connect.reload());
} }

2
package.json
View File

@@ -58,6 +58,6 @@
"phantomjs": "1.9.19", "phantomjs": "1.9.19",
"selenium-webdriver": "^2.45.0", "selenium-webdriver": "^2.45.0",
"sinon-chai": "2.8.0", "sinon-chai": "2.8.0",
"swagger-client": "git://github.com/swagger-api/swagger-js.git#91ab7da9e0172879a999239bc658e858998d69b4" "swagger-client": "2.1.14"
} }
} }

2
src/main/javascript/view/partials/signature.js
View File

@@ -26,7 +26,7 @@ SwaggerUi.partials.signature = (function () {
// copy-pasted from swagger-js // copy-pasted from swagger-js
var getInlineModel = function(inlineStr) { var getInlineModel = function(inlineStr) {
if(/^Inline Model \d+$/.test(inlineStr)) { if(/^Inline Model \d+$/.test(inlineStr) && this.inlineModels) {
var id = parseInt(inlineStr.substr('Inline Model'.length).trim(),10); // var id = parseInt(inlineStr.substr('Inline Model'.length).trim(),10); //
var model = this.inlineModels[id]; var model = this.inlineModels[id];
return model; return model;