From 00bf83cd8ebef2a360e75387a919db7b838fe92a Mon Sep 17 00:00:00 2001 From: Natan Vivo Date: Sun, 24 Nov 2013 17:30:32 -0200 Subject: [PATCH 1/2] Fix noConflict() definition to return typeof(Backbone), added declaration of Backbone.$; --- backbone/backbone.d.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/backbone/backbone.d.ts b/backbone/backbone.d.ts index 4e96ebef13..869cf7a060 100644 --- a/backbone/backbone.d.ts +++ b/backbone/backbone.d.ts @@ -330,12 +330,8 @@ declare module Backbone { var emulateJSONBackbone: boolean; // Utility - - // 0.9 cannot return modules anymore, and "typeof " is not compiling for some reason - // returning "any" until this is fixed - - //function noConflict(): typeof Backbone; - function noConflict(): any; - + function noConflict(): typeof Backbone; function setDomLibrary(jQueryNew: any): any; + + var $: JQueryStatic; } From 2e52be773f698acccf0318ef06aa67ffdc927c0a Mon Sep 17 00:00:00 2001 From: Natan Vivo Date: Sun, 24 Nov 2013 17:33:14 -0200 Subject: [PATCH 2/2] Fix space/tab issue. --- backbone/backbone.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backbone/backbone.d.ts b/backbone/backbone.d.ts index 869cf7a060..32a3e9e369 100644 --- a/backbone/backbone.d.ts +++ b/backbone/backbone.d.ts @@ -333,5 +333,5 @@ declare module Backbone { function noConflict(): typeof Backbone; function setDomLibrary(jQueryNew: any): any; - var $: JQueryStatic; + var $: JQueryStatic; }