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 #899 from oadam/master

Browse Source 
Fixed issue when using $.extend to merge defaultOptions and options
This commit is contained in:
Boris Yankov
2013-08-21 07:21:16 -07:00
parent b1fe017cbd 2faf4ef12c
commit c0d8c89c3b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jquery/jquery-tests.ts
+2 -2
View File
@@ -1239,7 +1239,7 @@ function test_extend() {
var defaults = { validate: false, limit: 5, name: "foo" };
var options = { validate: true, name: "bar" };
var settings = $.extend({}, defaults, options);
var settings: typeof defaults = $.extend({}, defaults, options);
}
function test_fadeIn() {
@@ -2331,4 +2331,4 @@ $.ajax({
success: function (data) {
alert(data);
}
});
});
jquery/jquery.d.ts
Vendored
+2 -2
View File
@@ -324,8 +324,8 @@ interface JQueryStatic {
each(collection: JQuery, callback: (indexInArray: number, valueOfElement: HTMLElement) => any): any;
each<T>(collection: T[], callback: (indexInArray: number, valueOfElement: T) => any): any;
extend(target: any, ...objs: any[]): Object;
extend(deep: boolean, target: any, ...objs: any[]): Object;
extend(target: any, ...objs: any[]): any;
extend(deep: boolean, target: any, ...objs: any[]): any;
globalEval(code: string): any;