From 5259a60b0247ccb6633466efe30107ef0e1dc224 Mon Sep 17 00:00:00 2001 From: Natan Vivo Date: Wed, 29 May 2013 22:33:17 -0300 Subject: [PATCH 1/2] Colleciton model must be any, as the class itself must be passed, not an instance. Template parameter is optional. --- backbone/backbone.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backbone/backbone.d.ts b/backbone/backbone.d.ts index d9eca0f21..92ff102dc 100644 --- a/backbone/backbone.d.ts +++ b/backbone/backbone.d.ts @@ -135,7 +135,7 @@ declare module Backbone { static extend(properties: any, classProperties?: any): any; // do not use, prefer TypeScript's extend functionality - model: Model; + model: any; models: any; collection: Model; length: number; @@ -265,7 +265,7 @@ declare module Backbone { $(selector: string): JQuery; model: Model; collection: Collection; - template: (data: any) => string; + template: (data?: any) => string; make(tagName: string, attrs?, opts?): View; setElement(element: HTMLElement, delegate?: bool); id: string; From a5d0e4d129bcf198ff63cd3674f9e19c8735a611 Mon Sep 17 00:00:00 2001 From: Natan Vivo Date: Wed, 29 May 2013 22:41:48 -0300 Subject: [PATCH 2/2] Generalize the type definition some methods that accept Views. Specialize the return for some render() methods. --- marionette/marionette.d.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/marionette/marionette.d.ts b/marionette/marionette.d.ts index 58849616e..4a2c5e903 100644 --- a/marionette/marionette.d.ts +++ b/marionette/marionette.d.ts @@ -106,7 +106,7 @@ declare module Marionette { function getOption(target, optionName): any; function triggerMethod(name, ...args: any[]): any; - function MonitorDOMRefresh(view: View): void; + function MonitorDOMRefresh(view: Backbone.View): void; function bindEntityEvents(target, entity, bindings); function unbindEntityEvents(target, entity, bindings); @@ -126,11 +126,11 @@ declare module Marionette { el: any; - show(view: View): void; + show(view: Backbone.View): void; ensureEl(): void; - open(view: View): void; + open(view: Backbone.View): void; close(): void; - attachView(view: View); + attachView(view: Backbone.View); reset(); } @@ -214,7 +214,7 @@ declare module Marionette { ui: any; serializeData(): any; - render(): View; + render(): ItemView; close(); } @@ -229,7 +229,7 @@ declare module Marionette { triggerBeforeRender(); triggerRendered(); - render(): View; + render(): CollectionView; getItemView(item: any): ItemView; addItemView(item: any, ItemView: ItemView, index: Number); @@ -254,6 +254,7 @@ declare module Marionette { itemView: any; itemViewContainer: string; + render(): CompositeView; appendHtml(cv: any, iv: any); renderModel(): any; } @@ -264,6 +265,7 @@ declare module Marionette { addRegion(name: string, definition: any): Region; addRegions(regions: any): any; + render(): Layout; removeRegion(name: string); }