aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-09-09 06:38:47 +0800
committerDan Finlay <dan@danfinlay.com>2016-09-09 06:41:21 +0800
commit6c05c221cd8e8bef2ce4efc5ae03ee7a39e3e0bf (patch)
tree09cf5fcf53faaf8290ebe814ad3bedb473ae2a26 /ui
parent1f0b2ca787670455a2cbecf9d539a7fb66793525 (diff)
downloadtangerine-wallet-browser-6c05c221cd8e8bef2ce4efc5ae03ee7a39e3e0bf.tar
tangerine-wallet-browser-6c05c221cd8e8bef2ce4efc5ae03ee7a39e3e0bf.tar.gz
tangerine-wallet-browser-6c05c221cd8e8bef2ce4efc5ae03ee7a39e3e0bf.tar.bz2
tangerine-wallet-browser-6c05c221cd8e8bef2ce4efc5ae03ee7a39e3e0bf.tar.lz
tangerine-wallet-browser-6c05c221cd8e8bef2ce4efc5ae03ee7a39e3e0bf.tar.xz
tangerine-wallet-browser-6c05c221cd8e8bef2ce4efc5ae03ee7a39e3e0bf.tar.zst
tangerine-wallet-browser-6c05c221cd8e8bef2ce4efc5ae03ee7a39e3e0bf.zip
Fix new logo related errors
Fixed logo deallocation related bugs, had to patch the logo repo itself to add a stopAnimating method. Also tuned up the logo to more closely resemble the old behavior. - Overlaps the title text - Points nose at cursor, not just front of eyes - Cursor is more "distant" from fox, to avoid extreme angles on edges.
Diffstat (limited to 'ui')
-rw-r--r--ui/app/components/mascot.js9
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