Skip to content

Commit 73a5e60

Browse files
authored
Merge pull request #445 from patternfly/fix-avatar-ie11
Fix pfe-avatar in ie11 by creating a size fallback and rounding rgb values before assignment.
2 parents daf5ca0 + 678dfe0 commit 73a5e60

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

elements/pfe-avatar/demo/index.html

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@
1313
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue/2.5.2/vue.min.js"></script>
1414

1515
<!-- uncomment the es5-adapter if you're using the umd version -->
16-
<!-- <script src="/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script> -->
17-
<!-- <script src="/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script> -->
18-
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.5/require.min.js"></script> -->
19-
<!-- <script>require(['../../pfelement/pfelement.umd.js', '../pfe-avatar.umd.js'], function(PFElement) { -->
20-
<!-- PFElement.debugLog(true); -->
21-
<!-- })</script> -->
16+
<script src="/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
17+
<script src="/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script>
18+
<script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.5/require.min.js"></script>
19+
<script>require(['../pfe-avatar.umd.js'])</script>
2220

23-
<script type="module" src="../pfe-avatar.js"></script>
21+
<!-- <script type="module" src="../pfe-avatar.js"></script> -->
2422

2523
<style type="text/css" media="screen">
2624
/* :root {
@@ -47,7 +45,7 @@
4745
</ul>
4846

4947
<script>
50-
const app = new Vue({
48+
var app = new Vue({
5149
el: "#app",
5250
data: {
5351
people: [

elements/pfe-avatar/src/hslrgb.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ export function hsl2rgb(_H, _S, _L) {
3939

4040
a = 2 * L - b;
4141

42-
R = 255 * h2rgb(a, b, H + 1 / 3);
43-
G = 255 * h2rgb(a, b, H);
44-
B = 255 * h2rgb(a, b, H - 1 / 3);
42+
R = Math.floor(255 * h2rgb(a, b, H + 1 / 3));
43+
G = Math.floor(255 * h2rgb(a, b, H));
44+
B = Math.floor(255 * h2rgb(a, b, H - 1 / 3));
4545
}
4646

4747
return [R, G, B];
4848
}
4949

5050
/**
51-
* Convert an RGBcolor to HSL .
51+
* Convert an RGBcolor to HSL.
5252
*
5353
* @param {Number} R the red component
5454
* @param {Number} G the green component

elements/pfe-avatar/src/pfe-avatar.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ class PfeAvatar extends PFElement {
2626
};
2727
}
2828

29+
static get defaultSize() {
30+
return 128;
31+
}
32+
2933
static get defaultColors() {
3034
return "#67accf #448087 #709c6b #a35252 #826cbb";
3135
}
@@ -90,7 +94,9 @@ class PfeAvatar extends PFElement {
9094

9195
_initCanvas() {
9296
this._canvas = this.shadowRoot.querySelector("canvas");
93-
const size = this.var("--pfe-avatar--width").replace(/px$/, "");
97+
const size =
98+
this.var("--pfe-avatar--width").replace(/px$/, "") ||
99+
PfeAvatar.defaultSize;
94100
this._canvas.width = size;
95101
this._canvas.height = size;
96102

0 commit comments

Comments
 (0)