vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing merge conflicts

Browse source
This commit is contained in:
Jackson Nowotny 2017-08-29 10:30:45 -05:00
parent aaa448ac4e
commit 5303e70fde
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
render/render.js
View file

@ -631,7 +631,7 @@ module.exports = function($window) {
dom.vnodes = vnodes
for (var i = 0; i < hooks.length; i++) hooks[i]()
// 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()
if (active != null && $doc.activeElement !== active) active.focus()
}
return {render: render, setEventCallback: setEventCallback}