lodash: changed _.noConflict

This commit is contained in:
Ilya Mochalov
2016-03-28 23:49:06 +05:00
parent 80057d687a
commit e49f2982f0
4 changed files with 48 additions and 12 deletions
+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
+7
View File
@@ -15430,6 +15430,13 @@ declare module _ {
noConflict(): typeof _;
}
interface LoDashExplicitWrapperBase<T, TWrapper> {
/**
* @see _.noConflict
*/
noConflict(): LoDashExplicitObjectWrapper<typeof _>;
}
//_.noop
interface LoDashStatic {
/**
+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
+7
View File
@@ -18614,6 +18614,13 @@ declare module _ {
noConflict(): typeof _;
}
interface LoDashExplicitWrapperBase<T, TWrapper> {
/**
* @see _.noConflict
*/
noConflict(): LoDashExplicitObjectWrapper<typeof _>;
}
//_.noop
interface LoDashStatic {
/**