aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-09-10 00:43:36 +0800
committerGitHub <noreply@github.com>2016-09-10 00:43:36 +0800
commit12bd77f8b35264671a6d9c320acdff7ebd322195 (patch)
tree71965b86d921474ea73c147027b85e38e56b70a5
parent348f1fb79720446dacdaa84717a2c73090d779f7 (diff)
parent69aa2ed25fa860ea9d1d0afea8656de6ddb32e3d (diff)
downloadtangerine-wallet-browser-12bd77f8b35264671a6d9c320acdff7ebd322195.tar
tangerine-wallet-browser-12bd77f8b35264671a6d9c320acdff7ebd322195.tar.gz
tangerine-wallet-browser-12bd77f8b35264671a6d9c320acdff7ebd322195.tar.bz2
tangerine-wallet-browser-12bd77f8b35264671a6d9c320acdff7ebd322195.tar.lz
tangerine-wallet-browser-12bd77f8b35264671a6d9c320acdff7ebd322195.tar.xz
tangerine-wallet-browser-12bd77f8b35264671a6d9c320acdff7ebd322195.tar.zst
tangerine-wallet-browser-12bd77f8b35264671a6d9c320acdff7ebd322195.zip
Merge pull request #632 from MetaMask/FixLogoPasswordFollow
Fix fox logo password following
-rw-r--r--package.json2
-rw-r--r--ui/app/components/mascot.js3
2 files changed, 2 insertions, 3 deletions
diff --git a/package.json b/package.json
index 4b7be8265..1fc9a5f7d 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
"inject-css": "^0.1.1",
"jazzicon": "^1.1.3",
"menu-droppo": "^1.1.0",
- "metamask-logo": "^2.1.1",
+ "metamask-logo": "^2.1.2",
"mississippi": "^1.2.0",
"multiplex": "^6.7.0",
"once": "^1.3.3",
diff --git a/ui/app/components/mascot.js b/ui/app/components/mascot.js
index ae998406b..f015d0c4d 100644
--- a/ui/app/components/mascot.js
+++ b/ui/app/components/mascot.js
@@ -15,7 +15,7 @@ function Mascot () {
width: 200,
height: 200,
})
- if (!this.logo.webGLSupport) return
+
this.refollowMouse = debounce(this.logo.setFollowMouse.bind(this.logo, true), 1000)
this.unfollowMouse = this.logo.setFollowMouse.bind(this.logo, false)
}
@@ -53,7 +53,6 @@ Mascot.prototype.handleAnimationEvents = function () {
}
Mascot.prototype.lookAt = function (target) {
- if (!this.logo.webGLSupport) return
this.unfollowMouse()
this.logo.lookAt(target)
this.refollowMouse()