diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2017-05-02 00:01:25 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-02 00:01:25 +0800 |
commit | 0ceaf2be83aec072611b52e006f58a291e1801b8 (patch) | |
tree | 0c31c0cb82fe453c216b7cea8b29e72ab926ebd6 /ui/app | |
parent | c3481f0eb1e78de69a02155d7bba68d4a33a3efb (diff) | |
parent | b466de8306ee2dc25fad30b0bfd47c705513db7e (diff) | |
download | tangerine-wallet-browser-0ceaf2be83aec072611b52e006f58a291e1801b8.tar tangerine-wallet-browser-0ceaf2be83aec072611b52e006f58a291e1801b8.tar.gz tangerine-wallet-browser-0ceaf2be83aec072611b52e006f58a291e1801b8.tar.bz2 tangerine-wallet-browser-0ceaf2be83aec072611b52e006f58a291e1801b8.tar.lz tangerine-wallet-browser-0ceaf2be83aec072611b52e006f58a291e1801b8.tar.xz tangerine-wallet-browser-0ceaf2be83aec072611b52e006f58a291e1801b8.tar.zst tangerine-wallet-browser-0ceaf2be83aec072611b52e006f58a291e1801b8.zip |
Merge branch 'master' into flyswatter-patch-1
Diffstat (limited to 'ui/app')
-rw-r--r-- | ui/app/unlock.js | 12 |
1 files changed, 6 insertions, 6 deletions
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) } |