Merge pull request #1325 from nvivo/backbone

Fix declaration of Backbone.noConflict() and added Backbone.$
This commit is contained in:
Basarat Ali Syed 2013-11-24 13:00:44 -08:00
commit 45da52c02b

View File

@ -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;
}