diff options
| author | Frankie <frankie.diamond@gmail.com> | 2016-09-09 07:03:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-09 07:03:25 +0800 |
| commit | c97aef2b997e32aeab61d2a81a6513f237c66a31 (patch) | |
| tree | 3911014fabd11677573538727edbb95068457338 /ui/app | |
| parent | fc0f64a5a8cf23c0feed2e2583cf07de7c9548a5 (diff) | |
| parent | 4a7eab5b1aee8b122d06903bc032849d1c35a3a9 (diff) | |
| download | tangerine-wallet-browser-c97aef2b997e32aeab61d2a81a6513f237c66a31.tar tangerine-wallet-browser-c97aef2b997e32aeab61d2a81a6513f237c66a31.tar.gz tangerine-wallet-browser-c97aef2b997e32aeab61d2a81a6513f237c66a31.tar.bz2 tangerine-wallet-browser-c97aef2b997e32aeab61d2a81a6513f237c66a31.tar.lz tangerine-wallet-browser-c97aef2b997e32aeab61d2a81a6513f237c66a31.tar.xz tangerine-wallet-browser-c97aef2b997e32aeab61d2a81a6513f237c66a31.tar.zst tangerine-wallet-browser-c97aef2b997e32aeab61d2a81a6513f237c66a31.zip | |
Merge pull request #629 from MetaMask/FixLogoLeak
Fix new logo related errors
Diffstat (limited to 'ui/app')
| -rw-r--r-- | ui/app/components/mascot.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ui/app/components/mascot.js b/ui/app/components/mascot.js index d0d599ea0..ae998406b 100644 --- a/ui/app/components/mascot.js +++ b/ui/app/components/mascot.js @@ -26,7 +26,9 @@ Mascot.prototype.render = function () { // and we dont get that until render this.handleAnimationEvents() - return h('#metamask-mascot-container') + return h('#metamask-mascot-container', { + style: { zIndex: 2 }, + }) } Mascot.prototype.componentDidMount = function () { @@ -36,12 +38,13 @@ Mascot.prototype.componentDidMount = function () { } Mascot.prototype.componentWillUnmount = function () { - if (!this.logo.webGLSupport) return + this.animations = this.props.animationEventEmitter + this.animations.removeAllListeners() this.logo.container.remove() + this.logo.stopAnimation() } Mascot.prototype.handleAnimationEvents = function () { - if (!this.logo.webGLSupport) return // only setup listeners once if (this.animations) return this.animations = this.props.animationEventEmitter |