libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

KEYCLOAK-7248: Fixes for IE 11 (#5182)

Browse source
This commit is contained in:
Stan Silvert 2018-05-02 16:15:31 -04:00 committed by GitHub
parent 90e5c7f3eb
commit 20f24bffc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
themes/src/main/resources/theme/keycloak-preview/account/index.ftl
View file

@ -3,6 +3,11 @@
<head> <head>
<title>${msg("accountManagementTitle")}</title> <title>${msg("accountManagementTitle")}</title>
<meta charset="UTF-8">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="robots" content="noindex, nofollow">
<meta name="viewport" content="width=device-width, initial-scale=1">
<script> <script>
var authUrl = '${authUrl}'; var authUrl = '${authUrl}';
var baseUrl = '${baseUrl}'; var baseUrl = '${baseUrl}';
@ -33,11 +38,6 @@
<base href="${baseUrl}/"> <base href="${baseUrl}/">
<meta charset="UTF-8">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="robots" content="noindex, nofollow">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" href="${resourceUrl}/app/assets/img/favicon.ico" type="image/x-icon"/> <link rel="icon" href="${resourceUrl}/app/assets/img/favicon.ico" type="image/x-icon"/>
<!-- PatternFly --> <!-- PatternFly -->
@ -72,31 +72,6 @@
<script src="${resourceUrl}/node_modules/patternfly/dist/js/patternfly.min.js"></script> <script src="${resourceUrl}/node_modules/patternfly/dist/js/patternfly.min.js"></script>
<script src="${authUrl}/js/keycloak.js"></script> <script src="${authUrl}/js/keycloak.js"></script>
<script>
var keycloak = Keycloak('${authUrl}/realms/${realm.name}/account/keycloak.json');
keycloak.init({onLoad: 'check-sso'}).success(function(authenticated) {
var loadjs = function (url,loadListener) {
const script = document.createElement("script");
script.src = resourceUrl + url;
if (loadListener) script.addEventListener("load", loadListener);
document.head.appendChild(script);
};
loadjs("/node_modules/core-js/client/shim.min.js", function(){
loadjs("/node_modules/zone.js/dist/zone.min.js");
loadjs("/node_modules/systemjs/dist/system.src.js", function() {
loadjs("/systemjs.config.js");
System.import('${resourceUrl}/main.js').catch(function (err) {
console.error(err);
});
if (!keycloak.authenticated) document.getElementById("signInButton").style.visibility='visible';
});
});
}).error(function() {
alert('failed to initialize keycloak');
});
</script>
<!-- TODO: We should save these css and js into variables and then load in <!-- TODO: We should save these css and js into variables and then load in
main.ts for better performance. These might be loaded twice. main.ts for better performance. These might be loaded twice.
--> -->
@ -113,8 +88,32 @@
</#list> </#list>
</#if> </#if>
</head> </head>
<body> <body>
<script>
var keycloak = Keycloak('${authUrl}/realms/${realm.name}/account/keycloak.json');
var loadjs = function (url,loadListener) {
const script = document.createElement("script");
script.src = resourceUrl + url;
if (loadListener) script.addEventListener("load", loadListener);
document.head.appendChild(script);
};
keycloak.init({onLoad: 'check-sso'}).success(function(authenticated) {
loadjs("/node_modules/core-js/client/shim.min.js", function(){
loadjs("/node_modules/zone.js/dist/zone.min.js");
loadjs("/node_modules/systemjs/dist/system.src.js", function() {
loadjs("/systemjs.config.js");
System.import('${resourceUrl}/main.js').catch(function (err) {
console.error(err);
});
if (!keycloak.authenticated) document.getElementById("signInButton").style.visibility='visible';
});
});
}).error(function() {
alert('failed to initialize keycloak');
});
</script>
<!-- Top Navigation --> <!-- Top Navigation -->
@ -151,7 +150,7 @@
<!--Top Nav --> <!--Top Nav -->
<!-- Home Page ---> <!-- Home Page -->
<div class="cards-pf" id="welcomeScreen"> <div class="cards-pf" id="welcomeScreen">
<div class="text-center"> <div class="text-center">
@ -232,8 +231,8 @@
<script> <script>
var winHash = window.location.hash; var winHash = window.location.hash;
if (winHash.startsWith('#/') && !winHash.startsWith('#/&state')) { if ((winHash.indexOf('#/') == 0) && (!winHash.indexOf('#/&state') == 0)) {
document.getElementById("welcomeScreen").style.visibility='hidden'; document.getElementById("welcomeScreen").style.display='none';
} }
</script> </script>

4
themes/src/main/resources/theme/keycloak-preview/account/resources/app/app.component.ts
View file

@ -54,7 +54,9 @@ export class AppComponent implements MenuClickListener {
if (navEnd.url !== '/') { if (navEnd.url !== '/') {
this.showSideNav = true; this.showSideNav = true;
var welcomeScreen = document.getElementById('welcomeScreen') var welcomeScreen = document.getElementById('welcomeScreen')
if (welcomeScreen) welcomeScreen.remove();
// must use removeChild() -- remove() not available on IE 11
if (welcomeScreen) welcomeScreen.parentNode.removeChild(welcomeScreen);
} }
} }
}); });

5
themes/src/main/resources/theme/keycloak-preview/account/resources/systemjs-angular-loader.js
View file

@ -11,6 +11,11 @@ module.exports.translate = function(load){
basePathParts.pop(); basePathParts.pop();
var basePath = basePathParts.join('/'); var basePath = basePathParts.join('/');
// basePath leaves out leading slash on IE 11
if (!basePath.startsWith('/')) {
basePath = '/' + basePath;
}
var baseHref = document.createElement('a'); var baseHref = document.createElement('a');
baseHref.href = this.baseURL; baseHref.href = this.baseURL;
baseHref = baseHref.pathname; baseHref = baseHref.pathname;