From c27e60d3fc76c0feb6262adcff9bcffbbd06e7eb Mon Sep 17 00:00:00 2001 From: Brian Zengel Date: Sun, 20 Oct 2013 18:24:05 -0400 Subject: [PATCH] added _.noConflict definition --- lodash/lodash-tests.ts | 2 ++ lodash/lodash.d.ts | 25 ++++++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/lodash/lodash-tests.ts b/lodash/lodash-tests.ts index fb52aec26d..102baa1895 100644 --- a/lodash/lodash-tests.ts +++ b/lodash/lodash-tests.ts @@ -722,6 +722,8 @@ _.mixin({ } }); +var lodash = _.noConflict(); + ////////////////////////////////////////////////////////////////////////////////////////////////// var iceCream = { flavor: "chocolate" }; diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts index 8315ceddbf..7897d283ba 100644 --- a/lodash/lodash.d.ts +++ b/lodash/lodash.d.ts @@ -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 _; + + + + + + + + +