use model variables instead of window

This commit is contained in:
Tony Tam
2016-11-14 11:00:04 -08:00
parent 552865aa0d
commit a63dc0c51b
4 changed files with 10 additions and 10 deletions

8
dist/swagger-ui.js vendored
View File

@@ -21935,8 +21935,8 @@ window.SwaggerUi.utils = {};
'use strict'; 'use strict';
window.SwaggerUi.utils = { window.SwaggerUi.utils = {
parseSecurityDefinitions: function (security) { parseSecurityDefinitions: function (security, securityDefinitions) {
var auths = Object.assign({}, window.swaggerUi.api.authSchemes || window.swaggerUi.api.securityDefinitions); var auths = Object.assign({}, securityDefinitions);
var oauth2Arr = []; var oauth2Arr = [];
var authsArr = []; var authsArr = [];
var scopes = []; var scopes = [];
@@ -23075,9 +23075,9 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
} }
if (Array.isArray(this.model.security)) { if (Array.isArray(this.model.security)) {
var authsModel = SwaggerUi.utils.parseSecurityDefinitions(this.model.security); var authsModel = SwaggerUi.utils.parseSecurityDefinitions(this.model.security, this.model.parent.securityDefinitions);
authsModel.isLogout = !_.isEmpty(window.swaggerUi.api.clientAuthorizations.authz); authsModel.isLogout = !_.isEmpty(this.model.clientAuthorizations.authz);
this.authView = new SwaggerUi.Views.AuthButtonView({ this.authView = new SwaggerUi.Views.AuthButtonView({
data: authsModel, data: authsModel,
router: this.router, router: this.router,

File diff suppressed because one or more lines are too long

View File

@@ -1,8 +1,8 @@
'use strict'; 'use strict';
window.SwaggerUi.utils = { window.SwaggerUi.utils = {
parseSecurityDefinitions: function (security) { parseSecurityDefinitions: function (security, securityDefinitions) {
var auths = Object.assign({}, window.swaggerUi.api.authSchemes || window.swaggerUi.api.securityDefinitions); var auths = Object.assign({}, securityDefinitions);
var oauth2Arr = []; var oauth2Arr = [];
var authsArr = []; var authsArr = [];
var scopes = []; var scopes = [];

View File

@@ -258,9 +258,9 @@ SwaggerUi.Views.OperationView = Backbone.View.extend({
} }
if (Array.isArray(this.model.security)) { if (Array.isArray(this.model.security)) {
var authsModel = SwaggerUi.utils.parseSecurityDefinitions(this.model.security); var authsModel = SwaggerUi.utils.parseSecurityDefinitions(this.model.security, this.model.parent.securityDefinitions);
authsModel.isLogout = !_.isEmpty(window.swaggerUi.api.clientAuthorizations.authz); authsModel.isLogout = !_.isEmpty(this.model.clientAuthorizations.authz);
this.authView = new SwaggerUi.Views.AuthButtonView({ this.authView = new SwaggerUi.Views.AuthButtonView({
data: authsModel, data: authsModel,
router: this.router, router: this.router,