From 5e1552b1ee6da2a4354accb19715b6ef50d853d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A1s=20Parditka?= <andraaspar@gmail.com>
Date: Thu, 3 Nov 2016 17:27:58 +0100
Subject: [PATCH] Fixed #1343, #1336. (#1383)

---
 index.d.ts   | 4 ++--
 mithril.d.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index a87405d8..d6aae5da 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -7,7 +7,7 @@
 
 export interface ChildArray extends Array<Children> {}
 export type Children = Child | ChildArray;
-export type Child = string | VirtualElement | Component<Controller>;
+export type Child = string | TrustedString | VirtualElement | Component<Controller>;
 
 export interface Static {
 	/**
@@ -884,7 +884,7 @@ export interface Component<T extends Controller> {
 	*
 	* @see m.component
 	*/
-	controller: ControllerFunction<T> | ControllerConstructor<T>;
+	controller?: ControllerFunction<T> | ControllerConstructor<T>;
 
 	/**
 	* Creates a view out of virtual elements.
diff --git a/mithril.d.ts b/mithril.d.ts
index 9189d3ca..fba1b56a 100644
--- a/mithril.d.ts
+++ b/mithril.d.ts
@@ -7,7 +7,7 @@
 declare namespace Mithril {
 	interface ChildArray extends Array<Children> {}
 	type Children = Child | ChildArray;
-	type Child = string | VirtualElement | Component<Controller>;
+	type Child = string | TrustedString | VirtualElement | Component<Controller>;
 
 	interface Static {
 		/**
@@ -558,7 +558,7 @@ declare namespace Mithril {
 		*
 		* @see m.component
 		*/
-		controller: ControllerFunction<T> | ControllerConstructor<T>;
+		controller?: ControllerFunction<T> | ControllerConstructor<T>;
 
 		/**
 		* Creates a view out of virtual elements.