Merge pull request #6810 from mmiszy/master

jquery: Fix noConflict return type. Fix #5840
This commit is contained in:
John Reilly
2016-02-18 05:39:43 +00:00

2
jquery/jquery.d.ts vendored
View File

@@ -805,7 +805,7 @@ interface JQueryStatic {
*
* @param removeAll A Boolean indicating whether to remove all jQuery variables from the global scope (including jQuery itself).
*/
noConflict(removeAll?: boolean): Object;
noConflict(removeAll?: boolean): JQueryStatic;
/**
* Provides a way to execute callback functions based on one or more objects, usually Deferred objects that represent asynchronous events.