wassname/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/wassname/DefinitelyTyped.git synced 2026-09-09 11:13:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8754 from chrootsu/lodash-noConflict

Browse Source 
lodash: changed _.noConflict
This commit is contained in:
Masahiro Wakame
2016-03-31 00:25:09 +09:00
parent 1c94cfb32e e49f2982f0
commit b1f03fae69
4 changed files with 48 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lodash/lodash-3.10-tests.ts
+17 -6
View File
@@ -10270,12 +10270,23 @@ namespace TestMixin {
}
// _.noConflict
{
let result: typeof _;
result = _.noConflict();
result = _(42).noConflict();
result = _<any>([]).noConflict();
result = _({}).noConflict();
namespace TestNoConflict {
{
let result: typeof _;
result = _.noConflict();
result = _(42).noConflict();
result = _<any>([]).noConflict();
result = _({}).noConflict();
}
{
let result: _.LoDashExplicitObjectWrapper<typeof _>;
result = _(42).chain().noConflict();
result = _<any>([]).chain().noConflict();
result = _({}).chain().noConflict();
}
}
// _.noop
lodash/lodash-3.10.d.ts
Vendored
+7
View File
@@ -15430,6 +15430,13 @@ declare module _ {
noConflict(): typeof _;
}
interface LoDashExplicitWrapperBase<T, TWrapper> {
/**
* @see _.noConflict
*/
noConflict(): LoDashExplicitObjectWrapper<typeof _>;
}
//_.noop
interface LoDashStatic {
/**
lodash/lodash-tests.ts
+17 -6
View File
@@ -11506,12 +11506,23 @@ namespace TestMixin {
}
// _.noConflict
{
let result: typeof _;
result = _.noConflict();
result = _(42).noConflict();
result = _<any>([]).noConflict();
result = _({}).noConflict();
namespace TestNoConflict {
{
let result: typeof _;
result = _.noConflict();
result = _(42).noConflict();
result = _<any>([]).noConflict();
result = _({}).noConflict();
}
{
let result: _.LoDashExplicitObjectWrapper<typeof _>;
result = _(42).chain().noConflict();
result = _<any>([]).chain().noConflict();
result = _({}).chain().noConflict();
}
}
// _.noop
lodash/lodash.d.ts
Vendored
+7
View File
@@ -18614,6 +18614,13 @@ declare module _ {
noConflict(): typeof _;
}
interface LoDashExplicitWrapperBase<T, TWrapper> {
/**
* @see _.noConflict
*/
noConflict(): LoDashExplicitObjectWrapper<typeof _>;
}
//_.noop
interface LoDashStatic {
/**