added _.noConflict definition

This commit is contained in:
Brian Zengel
2013-10-20 18:24:05 -04:00
parent a00e1937b3
commit c27e60d3fc
2 changed files with 14 additions and 13 deletions

View File

@@ -722,6 +722,8 @@ _.mixin({
}
});
var lodash = <typeof _>_.noConflict();
//////////////////////////////////////////////////////////////////////////////////////////////////
var iceCream = { flavor: "chocolate" };

25
lodash/lodash.d.ts vendored
View File

@@ -2727,21 +2727,20 @@ declare module _ {
**/
export function mixin(object: Dictionary<(value: any) => any>): void;
/**
* Give control of the "_" variable back to its previous owner.
* Returns a reference to the Lo-Dash object.
* @return Lo-Dash object reference.
* Reverts the '_' variable to its previous value and returns a reference to the lodash function.
* @return The lodash function.
**/
export function noConflict(): any;
export function noConflict(): typeof _;