Merge branch 'master' into flyswatter-patch-1

feature/default_network_editable
Kevin Serrano 8 years ago committed by GitHub
commit 0ceaf2be83
  1. 3
      CHANGELOG.md
  2. 12
      ui/app/unlock.js

@ -4,6 +4,9 @@
## 3.6.1 2017-4-30
- Made fox less nosy.
- Fix bug where error was reported in debugger console when Chrome opened a new window.
- Fix bug where block-tracker could stop polling for new blocks.

@ -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)
}

Loading…
Cancel
Save