diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2017-05-02 00:00:32 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-02 00:00:32 +0800 |
commit | b466de8306ee2dc25fad30b0bfd47c705513db7e (patch) | |
tree | f7588d4ca362b30367afe233eee34a4e14410e5a | |
parent | 753de30b3b2ed732e7533dc086f8f47a4ac7f7f4 (diff) | |
parent | 791c8fccf8e4049b90f096968dc57d9dab7b3c7a (diff) | |
download | tangerine-wallet-browser-b466de8306ee2dc25fad30b0bfd47c705513db7e.tar tangerine-wallet-browser-b466de8306ee2dc25fad30b0bfd47c705513db7e.tar.gz tangerine-wallet-browser-b466de8306ee2dc25fad30b0bfd47c705513db7e.tar.bz2 tangerine-wallet-browser-b466de8306ee2dc25fad30b0bfd47c705513db7e.tar.lz tangerine-wallet-browser-b466de8306ee2dc25fad30b0bfd47c705513db7e.tar.xz tangerine-wallet-browser-b466de8306ee2dc25fad30b0bfd47c705513db7e.tar.zst tangerine-wallet-browser-b466de8306ee2dc25fad30b0bfd47c705513db7e.zip |
Merge pull request #1362 from MetaMask/FoxLookAway
Make fox look away while typing password
-rw-r--r-- | CHANGELOG.md | 2 | ||||
-rw-r--r-- | ui/app/unlock.js | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 517a1830b..ddbf0808c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Master +- Made fox less nosy. + ## 3.6.1 2017-4-25 - Fix bug where error was reported in debugger console when Chrome opened a new window. diff --git a/ui/app/unlock.js b/ui/app/unlock.js index 1aee3c5d0..5014744f5 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 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, - }) + 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) } |