From 23d7e0b31e6e3ac62b5f5272b232727a34eb36da Mon Sep 17 00:00:00 2001
From: Zeeshan Hamid <zee@budzee.com>
Date: Fri, 10 May 2013 16:56:59 -0400
Subject: [PATCH] Update backbone and marionette

---
 backbone/backbone.d.ts     |  1 +
 marionette/marionette.d.ts | 77 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 marionette/marionette.d.ts

diff --git a/backbone/backbone.d.ts b/backbone/backbone.d.ts
index caf6bfe00..d9eca0f21 100644
--- a/backbone/backbone.d.ts
+++ b/backbone/backbone.d.ts
@@ -265,6 +265,7 @@ declare module Backbone {
         $(selector: string): JQuery;
         model: Model;
         collection: Collection;
+        template: (data: any) => string;
         make(tagName: string, attrs?, opts?): View;
         setElement(element: HTMLElement, delegate?: bool);
         id: string;
diff --git a/marionette/marionette.d.ts b/marionette/marionette.d.ts
new file mode 100644
index 000000000..8865e7920
--- /dev/null
+++ b/marionette/marionette.d.ts
@@ -0,0 +1,77 @@
+// Type definitions for Marionette
+// Project: https://github.com/zhamid/marionette
+// Definitions by: Zeeshan Hamid <https://github.com/zhamid>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../backbone/backbone.d.ts" />
+
+declare module Marionette {
+
+  export class View extends Backbone.View {
+    constructor(options?: any);
+
+    modelEvents: any;
+    collectionEvents: any;
+    ui: any;
+
+    getTemplate(): any;
+    mixinTemplateHelpers(target?: any): any;
+    configureTriggers(): any;
+    delegateEvents(events?: any): any;
+    undelegateEvents();
+
+    close();
+    bindUIElements();
+    unbindUIElements();
+  }
+
+  export class ItemView extends Marionette.View {
+    ui: any;
+
+    constructor(options?: any);
+
+    serializeData(): any;
+    render(): View;
+    close();
+  }
+
+  export class CollectionView extends Marionette.View {
+    itemView: any;
+
+    constructor(options?: any);
+
+    _initialEvents();
+    addChildView(item: View, collection: View, options?: any);
+    onShowCalled();
+
+    triggerBeforeRender();
+    triggerRendered();
+    render(): View;
+
+    getItemView(item: any): ItemView;
+    addItemView(item: any, ItemView: ItemView, index: Number);
+    renderItemView(view: View, index: Number);
+    buildItemView(item: any, ItemViewType: any, itemViewOptions: any): any;
+    removeItemView(item: any);
+    removeChildView(view: View);
+
+    checkEmpty();
+
+    appendHtml(collectionView: View, itemView: View, index: Number);
+
+    close();
+    closeChildren();
+    addChildViewEventForwarding(view: View);
+  }
+
+
+  export class CompositeView extends Marionette.CollectionView {
+    itemView: any;
+    itemViewContainer: string;
+
+    constructor(options?: any);
+
+    appendHtml(cv: any, iv: any);
+  }
+
+}
\ No newline at end of file