logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 52d68be157d5076b6da2e0f6d33abc1f7e285950
parent: b84d1533d42fd3abed9e8a9d86defa0264c309a8
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue, 31 Jan 2017 19:05:26 +0100

Fix CORS issue on avatars resampling

Diffstat:

Mapp/assets/javascripts/components/components/avatar.jsx2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/components/components/avatar.jsx b/app/assets/javascripts/components/components/avatar.jsx @@ -131,7 +131,7 @@ const Avatar = React.createClass({ return ( <div onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave} style={{ ...this.props.style, width: `${this.props.size}px`, height: `${this.props.size}px`, position: 'relative' }}> - <img ref={this.setImageRef} onLoad={this.handleLoad} src={this.props.src} width={this.props.size} height={this.props.size} alt='' style={{ position: 'absolute', top: '0', left: '0', opacity: hovering ? '1' : '0', borderRadius: '4px' }} /> + <img ref={this.setImageRef} crossOrigin='anonymous' onLoad={this.handleLoad} src={this.props.src} width={this.props.size} height={this.props.size} alt='' style={{ position: 'absolute', top: '0', left: '0', opacity: hovering ? '1' : '0', borderRadius: '4px' }} /> <canvas ref={this.setCanvasRef} style={{ borderRadius: '4px', width: this.props.size, height: this.props.size, opacity: hovering ? '0' : '1' }} /> </div> );