diff --git a/marionette/marionette.d.ts b/marionette/marionette.d.ts index 730ba4880..91b9f9859 100644 --- a/marionette/marionette.d.ts +++ b/marionette/marionette.d.ts @@ -138,7 +138,7 @@ declare module Marionette { } class Controller extends Backbone.Events { - close(); + destroy(); } class Region extends Backbone.Events { @@ -150,9 +150,12 @@ declare module Marionette { show(view: Backbone.View): void; ensureEl(): void; open(view: Backbone.View): void; - close(): void; + destroy(): void; attachView(view: Backbone.View); reset(); + hasView(): boolean; + empty(); + } class RegionManager extends Controller { @@ -161,8 +164,8 @@ declare module Marionette { get(name: string): Region; removeRegion(name): void; removeRegions(): void; - closeRegions(): void; - close(); + emptyRegions(): void; + destroy(); //mixins from Collection (copied from Backbone's Collection declaration) @@ -221,7 +224,7 @@ declare module Marionette { delegateEvents(events?: any): any; undelegateEvents(); - close(); + destroy(); bindUIElements(); unbindUIElements(); @@ -235,8 +238,7 @@ declare module Marionette { ui(): any; serializeData(): any; - render(): ItemView; - close(); + render(): ItemView; } class CollectionView extends View { @@ -260,13 +262,13 @@ declare module Marionette { buildItemView(item: any, ItemViewType: any, itemViewOptions: any): any; removeItemView(item: any); removeChildView(view: View); - + isEmpty(): boolean; checkEmpty(); appendHtml(collectionView: View, itemView: View, index: Number); - close(); - closeChildren(); + destroy(); + destroyChildren(); } class CompositeView extends CollectionView { @@ -290,7 +292,7 @@ declare module Marionette { render(): LayoutView; removeRegion(name: string); } - + interface AppRouterOptions extends Backbone.RouterOptions { appRoutes: any; controller: any; @@ -316,7 +318,7 @@ declare module Marionette { addInitializer(initializer); start(options?); addRegions(regions); - closeRegions(): void; + emptyRegions(): void; removeRegion(region: Region); getRegion(regionName: string): Region; module(moduleNames, moduleDefinition);