Merge branch 'v1_1_x'

docs/change-log.md

@@ -10,6 +10,13 @@
 
 ---
 
+### v1.1.4
+
+#### Bug fixes:
+- Fix IE bug where active element is null causing render function to throw error. ([1943](https://github.com/MithrilJS/mithril.js/pull/1943))
+
+---
+
 ### v1.1.3
 
 #### Bug fixes:

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "mithril",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "lockfileVersion": 1,
   "dependencies": {
     "@alrra/travis-scripts": {

render/render.js

@@ -622,7 +622,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}