Merge next into optimize-events

This commit is contained in:
Isiah Meadows 2017-08-31 05:43:39 -04:00
commit 5209071011
7 changed files with 99 additions and 47 deletions

View file

@ -638,7 +638,8 @@ module.exports = function($window) {
updateNodes(dom, dom.vnodes, Vnode.normalizeChildren(vnodes), false, hooks, null, namespace === "http://www.w3.org/1999/xhtml" ? undefined : namespace)
dom.vnodes = vnodes
for (var i = 0; i < hooks.length; i++) hooks[i]()
if ($doc.activeElement !== active) active.focus()
// document.activeElement can return null in IE https://developer.mozilla.org/en-US/docs/Web/API/Document/activeElement
if (active != null && $doc.activeElement !== active) active.focus()
}
return {render: render, setEventCallback: setEventCallback}