Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix new logo related errors #629

Merged
merged 2 commits into from
Sep 8, 2016
Merged

Fix new logo related errors #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c05c22
Fix new logo related errors
danfinlay Sep 8, 2016
4a7eab5
Merge branch 'master' into FixLogoLeak
danfinlay Sep 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion development/states.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 6 additions & 3 deletions ui/app/components/mascot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand All @@ -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
Expand Down