aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2017-05-05 06:07:34 +0800
committerGitHub <noreply@github.com>2017-05-05 06:07:34 +0800
commita72f50509010a12bf4fb879f2c638a38d2a210d2 (patch)
treefc83523975cf14da1df0154fdbf08a38bf07e388
parent6f40447015e7ab3c910c04e2671e9161dcb6ea16 (diff)
parent833b9f183fca17599d4d225eeec077ddbc7bc7b0 (diff)
downloadtangerine-wallet-browser-a72f50509010a12bf4fb879f2c638a38d2a210d2.tar
tangerine-wallet-browser-a72f50509010a12bf4fb879f2c638a38d2a210d2.tar.gz
tangerine-wallet-browser-a72f50509010a12bf4fb879f2c638a38d2a210d2.tar.bz2
tangerine-wallet-browser-a72f50509010a12bf4fb879f2c638a38d2a210d2.tar.lz
tangerine-wallet-browser-a72f50509010a12bf4fb879f2c638a38d2a210d2.tar.xz
tangerine-wallet-browser-a72f50509010a12bf4fb879f2c638a38d2a210d2.tar.zst
tangerine-wallet-browser-a72f50509010a12bf4fb879f2c638a38d2a210d2.zip
Merge pull request #1369 from MetaMask/foxrevert
Revert the fox animation
-rw-r--r--app/scripts/lib/config-manager.js2
-rw-r--r--ui/app/unlock.js12
2 files changed, 7 insertions, 7 deletions
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index 340ad4292..ab9410842 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -155,7 +155,7 @@ ConfigManager.prototype.getCurrentRpcAddress = function () {
case 'kovan':
return KOVAN_RPC
-
+
case 'rinkeby':
return RINKEBY_RPC
diff --git a/ui/app/unlock.js b/ui/app/unlock.js
index 5014744f5..1aee3c5d0 100644
--- a/ui/app/unlock.js
+++ b/ui/app/unlock.js
@@ -109,10 +109,10 @@ UnlockScreen.prototype.submitPassword = function (event) {
UnlockScreen.prototype.inputChanged = function (event) {
// tell mascot to look at page action
var element = event.target
- var viewRect = element.getBoundingClientRect()
- var carat = getCaretCoordinates(element, element.selectionEnd)
- var x = viewRect.right - carat.left + element.scrollLeft
- var y = 100
- var pointAt = { x, y }
- this.animationEventEmitter.emit('point', pointAt)
+ var boundingRect = element.getBoundingClientRect()
+ var coordinates = getCaretCoordinates(element, element.selectionEnd)
+ this.animationEventEmitter.emit('point', {
+ x: boundingRect.left + coordinates.left - element.scrollLeft,
+ y: boundingRect.top + coordinates.top - element.scrollTop,
+ })
}