diff options
| author | Frankie <frankie.diamond@gmail.com> | 2016-09-09 04:45:27 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-09 04:45:27 +0800 |
| commit | 079c1a897260942af227d58a295c022765e34d59 (patch) | |
| tree | 58ca551838ac99a32981dfb181183fda88f8d778 /ui | |
| parent | 0d4bfe8038d2fe3617b769cf653152c6d5c47335 (diff) | |
| parent | 1f0b2ca787670455a2cbecf9d539a7fb66793525 (diff) | |
| download | tangerine-wallet-browser-079c1a897260942af227d58a295c022765e34d59.tar tangerine-wallet-browser-079c1a897260942af227d58a295c022765e34d59.tar.gz tangerine-wallet-browser-079c1a897260942af227d58a295c022765e34d59.tar.bz2 tangerine-wallet-browser-079c1a897260942af227d58a295c022765e34d59.tar.lz tangerine-wallet-browser-079c1a897260942af227d58a295c022765e34d59.tar.xz tangerine-wallet-browser-079c1a897260942af227d58a295c022765e34d59.tar.zst tangerine-wallet-browser-079c1a897260942af227d58a295c022765e34d59.zip | |
Merge branch 'master' into i#589pendingTxsIssue
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/app/components/mascot.js | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/ui/app/components/mascot.js b/ui/app/components/mascot.js index f2b00262b..d0d599ea0 100644 --- a/ui/app/components/mascot.js +++ b/ui/app/components/mascot.js @@ -14,7 +14,6 @@ function Mascot () { pxNotRatio: true, width: 200, height: 200, - staticImage: './images/icon-512.png', }) if (!this.logo.webGLSupport) return this.refollowMouse = debounce(this.logo.setFollowMouse.bind(this.logo, true), 1000) @@ -27,28 +26,18 @@ Mascot.prototype.render = function () { // and we dont get that until render this.handleAnimationEvents() - return ( - - h('#metamask-mascot-container') - - ) + return h('#metamask-mascot-container') } Mascot.prototype.componentDidMount = function () { var targetDivId = 'metamask-mascot-container' var container = document.getElementById(targetDivId) - if (!this.logo.webGLSupport) { - var staticLogo = this.logo.staticLogo - staticLogo.style.marginBottom = '40px' - container.appendChild(staticLogo) - } else { - container.appendChild(this.logo.canvas) - } + container.appendChild(this.logo.container) } Mascot.prototype.componentWillUnmount = function () { if (!this.logo.webGLSupport) return - this.logo.canvas.remove() + this.logo.container.remove() } Mascot.prototype.handleAnimationEvents = function () { |