Merge pull request DefinitelyTyped#1325 from nvivo/backbone

Fix declaration of Backbone.noConflict() and added Backbone.$
belov-gr · Nov 24, 2013 · 45da52c · 45da52c
2 parents 8b85319 + 2e52be7
commit 45da52c
Showing 1 changed file with 3 additions and 7 deletions.
diff --git 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 <Module>" 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;
 }