From f4109366f50ea09e372f917e76fd0c3302cbb757 Mon Sep 17 00:00:00 2001
From: Jesica Fera <jesica@corvalius.com>
Date: Wed, 4 Jun 2014 17:37:03 -0300
Subject: [PATCH 1/2] - Updated definition to version 1.2.5 of jquery.dynatree
 - Solved conflict that happens when using jquery.dynatree definitions and  
 jqueryui definitions together

---
 jquery.dynatree/jquery.dynatree.d.ts | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/jquery.dynatree/jquery.dynatree.d.ts b/jquery.dynatree/jquery.dynatree.d.ts
index 91425644d0..a631487239 100644
--- a/jquery.dynatree/jquery.dynatree.d.ts
+++ b/jquery.dynatree/jquery.dynatree.d.ts
@@ -1,22 +1,23 @@
-// Type definitions for jquery.dynatree 1.2
+// Type definitions for jquery.dynatree 1.2.5
 // Project: http://code.google.com/p/dynatree/
 // Definitions by: https://github.com/fdecampredon
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 
 /// <reference path="../jquery/jquery.d.ts"/>
+/// <reference path="../jqueryui/jqueryui.d.ts"/>
+
+declare module JQueryUI {
+    interface UI {
+        dynatree: DynatreeNamespace
+    }
+}
 
 interface JQuery {
     dynatree(options?: DynatreeOptions): DynaTree;
     dynatree(option?: string, ...rest: any[]): any;
 }
 
-interface JQueryStatic {
-    ui: {
-        dynatree: DynatreeNamespace;
-    };
-}
-
 interface DynaTree {
     activateKey(key: string): DynaTreeNode;
     count(): number;
@@ -39,7 +40,7 @@ interface DynaTree {
     renderInvisibleNodes(): void;
     selectKey(key: string, flag: string): DynaTreeNode;
     serializeArray(stopOnParents: boolean): any[];
-    toDict(): any;
+    toDict(includeRoot: boolean): any;
     visit(fn: (node: DynaTreeNode) =>boolean, includeRoot: boolean): void;
 }
 
@@ -77,6 +78,7 @@ interface DynaTreeNode {
     makeVisible(): boolean;
     move(targetNode: DynaTreeNode, mode: string): boolean;
     reload(force: boolean): void;
+    reloadChildren(callback?: (node: DynaTreeNode, isOk: boolean) => any): void;
     remove(): void;
     removeChildren(): void;
     render(useEffects: boolean, includeInvisible: boolean): void;
@@ -177,7 +179,7 @@ interface DynaTreeDataModel {
 interface DynaTreeDNDOptions {
     autoExpandMS?: number; // Expand nodes after n milliseconds of hovering.
     preventVoidMoves?: boolean; // Prevent dropping nodes 'before self', etc. 
-
+    revert: boolean; // true: slide helper back to source if drop is rejected
 
     // Make tree nodes draggable:
     onDragStart?: (sourceNode: any) =>void; // Callback(sourceNode), return true, to enable dnd
@@ -239,4 +241,4 @@ interface DynatreeNamespace {
     getNode(element: HTMLElement): DynaTreeNode;
     getPersistData(cookieId: string, cookieOpts: DynaTreeCookieOptions): any;
     version: number;
-}
+}
\ No newline at end of file

From 85785cef1ae7e77ea07fdf3d52bac1207f313a0b Mon Sep 17 00:00:00 2001
From: Jesica Fera <jesica@corvalius.com>
Date: Tue, 10 Jun 2014 12:15:35 -0300
Subject: [PATCH 2/2] Making parameter optional

---
 jquery.dynatree/jquery.dynatree.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jquery.dynatree/jquery.dynatree.d.ts b/jquery.dynatree/jquery.dynatree.d.ts
index a631487239..adf8b53994 100644
--- a/jquery.dynatree/jquery.dynatree.d.ts
+++ b/jquery.dynatree/jquery.dynatree.d.ts
@@ -40,7 +40,7 @@ interface DynaTree {
     renderInvisibleNodes(): void;
     selectKey(key: string, flag: string): DynaTreeNode;
     serializeArray(stopOnParents: boolean): any[];
-    toDict(includeRoot: boolean): any;
+    toDict(includeRoot?: boolean): any;
     visit(fn: (node: DynaTreeNode) =>boolean, includeRoot: boolean): void;
 }