From b3fa44db17b4f7db21177df73f5ac445194d72f9 Mon Sep 17 00:00:00 2001 From: Sven Date: Wed, 12 Feb 2014 21:55:43 +0100 Subject: [PATCH 1/3] Added closeRegions to Marionette.Application --- marionette/marionette.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/marionette/marionette.d.ts b/marionette/marionette.d.ts index dca2915c53..75bae47f22 100644 --- a/marionette/marionette.d.ts +++ b/marionette/marionette.d.ts @@ -288,6 +288,7 @@ declare module Marionette { addInitializer(initializer); start(options?); addRegions(regions); + closeRegions(): void; removeRegion(region: Region); getRegion(regionName: string): Region; module(moduleNames, moduleDefinition); From 6667394125c2d14fa67dc57492aaae0a6bf54db9 Mon Sep 17 00:00:00 2001 From: Sven Date: Wed, 12 Feb 2014 22:11:31 +0100 Subject: [PATCH 2/3] Improvment on AppRouter Added appRoute to Marionette.AppRouter Removed Controller type on processAppRoutes controller arg Added AppRouterOptions --- marionette/marionette.d.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/marionette/marionette.d.ts b/marionette/marionette.d.ts index 75bae47f22..6c18b8906d 100644 --- a/marionette/marionette.d.ts +++ b/marionette/marionette.d.ts @@ -269,11 +269,18 @@ declare module Marionette { render(): Layout; removeRegion(name: string); } + + interface AppRouterOptions extends Backbone.RouterOptions { + appRoutes: any; + controller: any; + } class AppRouter extends Backbone.Router { - constructor(options?: any); - processAppRoutes(controller: Controller, appRoutes: any); + constructor(options?: AppRouterOptions); + processAppRoutes(controller: any, appRoutes: any); + appRoute(route:string, methodName:string):void; + } class Application extends Backbone.Events { From e496efed374d76c60d5585f3e1a7d7a01396a9c4 Mon Sep 17 00:00:00 2001 From: Sven Date: Wed, 12 Feb 2014 22:22:50 +0100 Subject: [PATCH 3/3] Typed callback arg to Marionette.Callbacks.add as a Function --- marionette/marionette.d.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/marionette/marionette.d.ts b/marionette/marionette.d.ts index 6c18b8906d..3427d6de4e 100644 --- a/marionette/marionette.d.ts +++ b/marionette/marionette.d.ts @@ -112,8 +112,8 @@ declare module Marionette { function unbindEntityEvents(target, entity, bindings); class Callbacks { - add(callback, contextOverride): void; - run(options, context): void; + add(callback:Function, contextOverride:any): void; + run(options:any, context:any): void; reset(): void; }