From 08259b232b5e69cf23d0ad64e4801bd95e202ae3 Mon Sep 17 00:00:00 2001
From: Natan Vivo <nvivo64@gmail.com>
Date: Sat, 22 Jun 2013 10:24:07 -0300
Subject: [PATCH] Improvements to definition. * Model.urlRoot should be any, as
 it may be a string or a function. * Added internal methods to Router. *
 Improved definition of History:   - Extends Events   - Remove pushState
 method, it doesn't exist in the source   - Added internal methods to
 definition.

---
 backbone/backbone.d.ts | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/backbone/backbone.d.ts b/backbone/backbone.d.ts
index 7c5daeb423..90684b32d7 100644
--- a/backbone/backbone.d.ts
+++ b/backbone/backbone.d.ts
@@ -86,7 +86,6 @@ declare module Backbone {
         sync(...arg: any[]): JQueryXHR;
     }
 
-
     class Model extends ModelBase {
 
         static extend(properties: any, classProperties?: any): any; // do not use, prefer TypeScript's extend functionality
@@ -97,7 +96,7 @@ declare module Backbone {
         id: any;
         idAttribute: string;
         validationError: any;
-        urlRoot(): string;
+        urlRoot: any;
 
         constructor (attributes?: any, options?: any);
         initialize(attributes?: any);
@@ -229,16 +228,31 @@ declare module Backbone {
         route(route: string, name: string, callback?: (...parameter: any[]) => void);
         navigate(fragment: string, options?: NavigateOptions);
         navigate(fragment: string, trigger?: boolean);
+
+        _bindRoutes(): void;
+        _routeToRegExp(route: string): RegExp;
+        _extractParameters(route: RegExp, fragment: string): string[];
     }
 
     var history: History;
-    class History {
+
+    class History extends Events {
+
+        handlers: any[];
+        interval: number;
+
         start(options?: HistoryOptions);
-        navigate(fragment: string, options: any);
-        pushSate();
-        getFragment(fragment?: string, forcePushState?: boolean): string;
+
         getHash(window?: Window): string;
+        getFragment(fragment?: string, forcePushState?: boolean): string;
+        stop(): void;
+        route(route: string, callback: (...args: any[]) => void );
+        checkUrl(e?: any): void;
+        loadUrl(fragmentOverride: string): boolean;
+        navigate(fragment: string, options?: any);
         started: boolean;
+
+        _updateHash(location: Location, fragment: string, replace: bool);
     }
 
     interface ViewOptions {
@@ -294,3 +308,4 @@ declare module Backbone {
 
     function setDomLibrary(jQueryNew);
 }
+