mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 01:39:44 +01:00
Merge pull request #629 from MetaMask/FixLogoLeak
Fix new logo related errors
This commit is contained in:
commit
c97aef2b99
File diff suppressed because one or more lines are too long
@ -51,7 +51,7 @@
|
||||
"inject-css": "^0.1.1",
|
||||
"jazzicon": "^1.1.3",
|
||||
"menu-droppo": "^1.1.0",
|
||||
"metamask-logo": "^2.0.0",
|
||||
"metamask-logo": "^2.1.1",
|
||||
"mississippi": "^1.2.0",
|
||||
"multiplex": "^6.7.0",
|
||||
"once": "^1.3.3",
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user