favoring user specified scheme over the url scheme

jonocodes · jonocodes · commit 14468274bcf6 · 2015-12-18T13:02:43.000-08:00
diff --git a/lib/client.js b/lib/client.js
@@ -271,7 +271,7 @@ SwaggerClient.prototype.buildFromSpec = function (response) {
     if (typeof this.scheme === 'undefined' && typeof this.schemes === 'undefined' || this.schemes.length === 0) {
       this.scheme = location.scheme || 'http';
     } else if (typeof this.scheme === 'undefined') {
-      this.scheme = location.scheme || this.schemes[0];
+      this.scheme = this.schemes[0] || location.scheme;
     }
 
     if (typeof this.host === 'undefined' || this.host === '') {

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ SwaggerClient.prototype.buildFromSpec = function (response) {`
`271`	`271`	`if (typeof this.scheme === 'undefined' && typeof this.schemes === 'undefined' \|\| this.schemes.length === 0) {`
`272`	`272`	`this.scheme = location.scheme \|\| 'http';`
`273`	`273`	`} else if (typeof this.scheme === 'undefined') {`
`274`		`- this.scheme = location.scheme \|\| this.schemes[0];`
	`274`	`+ this.scheme = this.schemes[0] \|\| location.scheme;`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`if (typeof this.host === 'undefined' \|\| this.host === '') {`