vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Small JS fixes for the PR

Browse source
This commit is contained in:
Joseph Schorr 2017-01-26 12:03:56 -05:00
parent f8deb85751
commit c9812864be
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
static/directives/icon-image-view.html
View file

@ -1,4 +1,4 @@
<span class="icon-image-view-element"> <span class="icon-image-view-element">
<img ng-src="{{ value }}" ng-if="value.indexOf('http') == 0"> <img ng-src="{{ value }}" ng-if="value.indexOf('http') == 0">
<i class="fa" ng-class="value" ng-if="value.indexOf('http') < 0"></i> <i class="fa" ng-class="value" ng-if="value.indexOf('http') < 0"></i>
</span> </span>

2
static/js/directives/ui/icon-image-view.js
View file

@ -15,4 +15,4 @@ angular.module('quay').directive('iconImageView', function () {
} }
}; };
return directiveDefinitionObject; return directiveDefinitionObject;
}); });

5
static/js/services/external-login-service.js
View file

@ -5,7 +5,7 @@ angular.module('quay').factory('ExternalLoginService', ['Features', 'Config', 'A
function(Features, Config, ApiService) { function(Features, Config, ApiService) {
var externalLoginService = {}; var externalLoginService = {};
externalLoginService.EXTERNAL_LOGINS = window.__external_login; externalLoginService.EXTERNAL_LOGINS = window.__external_login || [];
externalLoginService.getLoginUrl = function(loginService, action, callback) { externalLoginService.getLoginUrl = function(loginService, action, callback) {
var errorDisplay = ApiService.errorDisplay('Could not load external login service ' + var errorDisplay = ApiService.errorDisplay('Could not load external login service ' +
@ -31,8 +31,7 @@ angular.module('quay').factory('ExternalLoginService', ['Features', 'Config', 'A
externalLoginService.getSingleSigninUrl = function(callback) { externalLoginService.getSingleSigninUrl = function(callback) {
if (!externalLoginService.hasSingleSignin()) { if (!externalLoginService.hasSingleSignin()) {
callback(null); return callback(null);
return;
} }
// If there is a single external login service and direct login is disabled, // If there is a single external login service and direct login is disabled,