Merge branch 'next' of github.com:lhorie/mithril.js into next

This commit is contained in:
Leo Horie 2016-02-05 12:19:41 -05:00
commit 56a51664b7
2 changed files with 17 additions and 4 deletions

View file

@ -362,7 +362,7 @@ var MyComponent = {
},
view: function(ctrl) {
return m("ul", [
ctrl.things().map(function(name) {
ctrl.things().map(function(thing) {
return m("li", thing.name)
})
]);

19
mithril.d.ts vendored
View file

@ -27,7 +27,7 @@ declare module _mithril {
MithrilVirtualElement<T> |
MithrilComponent<T>>
): MithrilVirtualElement<T>;
/**
* Initializes a component for use with m.render, m.mount, etc.
*
@ -127,6 +127,19 @@ declare module _mithril {
callbackThis: any
): (e: Event) => any;
/**
* Returns a event handler that can be bound to an element, firing with
* the specified property.
*
* @param attributeName Name of the element's attribute to bind to.
* @param property The property to bind.
* @return A function suitable for listening to an event.
*/
withAttr<T>(
attributeName: string,
property: MithrilBasicProperty<T>
) : (e: Event) => any;
/**
* @deprecated Use m.mount instead
*/
@ -561,7 +574,7 @@ declare module _mithril {
* @see MithrilControllerConstructor
*/
interface MithrilControllerFunction<T extends MithrilController> {
(): T;
(opts?: any): T;
}
/**
@ -603,7 +616,7 @@ declare module _mithril {
*
* @see m.component
*/
view(ctrl: T): MithrilVirtualElement<T>;
view(ctrl?: T, opts?: any): MithrilVirtualElement<T>;
}
/**