From 6c05c221cd8e8bef2ce4efc5ae03ee7a39e3e0bf Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Thu, 8 Sep 2016 15:38:47 -0700 Subject: 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. --- ui/app/components/mascot.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'ui/app') 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 -- cgit v1.2.3