Moved back to ng1
Change-Id: I43b284e3b3cb3ac19d43c088de988c89a7ea8807
diff --git a/typings/globals/jquery/index.d.ts b/typings/globals/jquery/index.d.ts
index ab95cde..cfe1b5a 100644
--- a/typings/globals/jquery/index.d.ts
+++ b/typings/globals/jquery/index.d.ts
@@ -1,5 +1,5 @@
// Generated by typings
-// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/c8a69b0b0c71cc00d4ada94a4420fb037b3cc9cd/jquery/jquery.d.ts
+// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/dc9dabe74a5be62613b17a3605309783a12ff28a/jquery/jquery.d.ts
interface JQueryAjaxSettings {
/**
* The content type sent in the request header that tells the server what kind of response it will accept in return. If the accepts setting needs modification, it is recommended to do so once in the $.ajaxSetup() method.
@@ -26,7 +26,7 @@
*/
contents?: { [key: string]: any; };
//According to jQuery.ajax source code, ajax's option actually allows contentType to set to "false"
- // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/742
+ // https://github.com/borisyankov/DefinitelyTyped/issues/742
/**
* When sending data to the server, use this content type. Default is "application/x-www-form-urlencoded; charset=UTF-8", which is fine for most cases. If you explicitly pass in a content-type to $.ajax(), then it is always sent to the server (even if no data is sent). The W3C XMLHttpRequest specification dictates that the charset is always UTF-8; specifying another charset will not force the browser to change the encoding.
*/
@@ -158,7 +158,7 @@
/**
* Incorporates the functionality of the .done() and .fail() methods, allowing (as of jQuery 1.8) the underlying Promise to be manipulated. Refer to deferred.then() for implementation details.
*/
- then<R>(doneCallback: (data: any, textStatus: string, jqXHR: JQueryXHR) => R, failCallback?: (jqXHR: JQueryXHR, textStatus: string, errorThrown: any) => void): JQueryPromise<R>;
+ then(doneCallback: (data: any, textStatus: string, jqXHR: JQueryXHR) => void, failCallback?: (jqXHR: JQueryXHR, textStatus: string, errorThrown: any) => void): JQueryPromise<any>;
/**
* Property containing the parsed response if the response Content-Type is json
*/
@@ -322,13 +322,6 @@
// Deprecated - given no typings
pipe(doneFilter?: (x: any) => any, failFilter?: (x: any) => any, progressFilter?: (x: any) => any): JQueryPromise<any>;
-
- /**
- * Return a Deferred's Promise object.
- *
- * @param target Object onto which the promise methods have to be attached
- */
- promise(target?: any): JQueryPromise<T>;
}
/**
@@ -427,7 +420,6 @@
* Interface of the JQuery extension of the W3C event object
*/
interface BaseJQueryEventObject extends Event {
- currentTarget: Element;
data: any;
delegateTarget: Element;
isDefaultPrevented(): boolean;
@@ -593,16 +585,6 @@
specialEasing?: Object;
}
-interface JQueryEasingFunction {
- ( percent: number ): number;
-}
-
-interface JQueryEasingFunctions {
- [ name: string ]: JQueryEasingFunction;
- linear: JQueryEasingFunction;
- swing: JQueryEasingFunction;
-}
-
/**
* Static members of jQuery (those on $ and jQuery themselves)
*/
@@ -663,12 +645,6 @@
*/
get(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
/**
- * Load data from the server using a HTTP GET request.
- *
- * @param settings The JQueryAjaxSettings to be used for the request
- */
- get(settings : JQueryAjaxSettings): JQueryXHR;
- /**
* Load JSON-encoded data from the server using a GET HTTP request.
*
* @param url A string containing the URL to which the request is sent.
@@ -713,12 +689,7 @@
* @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
*/
post(url: string, data?: Object|string, success?: (data: any, textStatus: string, jqXHR: JQueryXHR) => any, dataType?: string): JQueryXHR;
- /**
- * Load data from the server using a HTTP POST request.
- *
- * @param settings The JQueryAjaxSettings to be used for the request
- */
- post(settings : JQueryAjaxSettings): JQueryXHR;
+
/**
* A multi-purpose callbacks list object that provides a powerful way to manage callback lists.
*
@@ -802,7 +773,7 @@
*
* @param removeAll A Boolean indicating whether to remove all jQuery variables from the global scope (including jQuery itself).
*/
- noConflict(removeAll?: boolean): JQueryStatic;
+ noConflict(removeAll?: boolean): Object;
/**
* Provides a way to execute callback functions based on one or more objects, usually Deferred objects that represent asynchronous events.
@@ -896,9 +867,6 @@
/**
* Effects
*/
-
- easing: JQueryEasingFunctions;
-
fx: {
tick: () => void;
/**
@@ -1010,7 +978,7 @@
* @param func The function to process each item against. The first argument to the function is the item, and the second argument is the index. The function should return a Boolean value. this will be the global window object.
* @param invert If "invert" is false, or not provided, then the function returns an array consisting of all elements for which "callback" returns true. If "invert" is true, then the function returns an array consisting of all elements for which "callback" returns false.
*/
- grep<T>(array: T[], func: (elementOfArray?: T, indexInArray?: number) => boolean, invert?: boolean): T[];
+ grep<T>(array: T[], func: (elementOfArray: T, indexInArray: number) => boolean, invert?: boolean): T[];
/**
* Search for a specified value within an array and return its index (or -1 if not found).
@@ -1077,14 +1045,14 @@
* @param array The Array to translate.
* @param callback The function to process each item against. The first argument to the function is the array item, the second argument is the index in array The function can return any value. Within the function, this refers to the global (window) object.
*/
- map<T, U>(array: T[], callback: (elementOfArray?: T, indexInArray?: number) => U): U[];
+ map<T, U>(array: T[], callback: (elementOfArray: T, indexInArray: number) => U): U[];
/**
* Translate all items in an array or object to new array of items.
*
* @param arrayOrObject The Array or Object to translate.
* @param callback The function to process each item against. The first argument to the function is the value; the second argument is the index or key of the array or object property. The function can return any value to add to the array. A returned array will be flattened into the resulting array. Within the function, this refers to the global (window) object.
*/
- map(arrayOrObject: any, callback: (value?: any, indexOrKey?: any) => any): any;
+ map(arrayOrObject: any, callback: (value: any, indexOrKey: any) => any): any;
/**
* Merge the contents of two arrays together into the first array.
@@ -1974,24 +1942,6 @@
click(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
/**
- * Trigger the "contextmenu" event on an element.
- */
- contextmenu(): JQuery;
- /**
- * Bind an event handler to the "contextmenu" JavaScript event.
- *
- * @param handler A function to execute when the event is triggered.
- */
- contextmenu(handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
- /**
- * Bind an event handler to the "contextmenu" JavaScript event.
- *
- * @param eventData An object containing data that will be passed to the event handler.
- * @param handler A function to execute when the event is triggered.
- */
- contextmenu(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
-
- /**
* Trigger the "dblclick" event on an element.
*/
dblclick(): JQuery;
@@ -2290,13 +2240,6 @@
* Remove an event handler.
*
* @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin".
- * @param handler A handler function previously attached for the event(s), or the special value false. Takes handler with extra args that can be attached with on().
- */
- off(events: string, handler: (eventObject: JQueryEventObject, ...args: any[]) => any): JQuery;
- /**
- * Remove an event handler.
- *
- * @param events One or more space-separated event types and optional namespaces, or just namespaces, such as "click", "keydown.myPlugin", or ".myPlugin".
* @param handler A handler function previously attached for the event(s), or the special value false.
*/
off(events: string, handler: (eventObject: JQueryEventObject) => any): JQuery;
@@ -2618,10 +2561,10 @@
/**
* Insert content, specified by the parameter, after each element in the set of matched elements.
*
- * param content1 HTML string, DOM element, DocumentFragment, array of elements, or jQuery object to insert after each element in the set of matched elements.
+ * param content1 HTML string, DOM element, array of elements, or jQuery object to insert after each element in the set of matched elements.
* param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert after each element in the set of matched elements.
*/
- after(content1: JQuery|any[]|Element|DocumentFragment|Text|string, ...content2: any[]): JQuery;
+ after(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): JQuery;
/**
* Insert content, specified by the parameter, after each element in the set of matched elements.
*
@@ -2632,10 +2575,10 @@
/**
* Insert content, specified by the parameter, to the end of each element in the set of matched elements.
*
- * param content1 DOM element, DocumentFragment, array of elements, HTML string, or jQuery object to insert at the end of each element in the set of matched elements.
+ * param content1 DOM element, array of elements, HTML string, or jQuery object to insert at the end of each element in the set of matched elements.
* param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the end of each element in the set of matched elements.
*/
- append(content1: JQuery|any[]|Element|DocumentFragment|Text|string, ...content2: any[]): JQuery;
+ append(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): JQuery;
/**
* Insert content, specified by the parameter, to the end of each element in the set of matched elements.
*
@@ -2653,10 +2596,10 @@
/**
* Insert content, specified by the parameter, before each element in the set of matched elements.
*
- * param content1 HTML string, DOM element, DocumentFragment, array of elements, or jQuery object to insert before each element in the set of matched elements.
+ * param content1 HTML string, DOM element, array of elements, or jQuery object to insert before each element in the set of matched elements.
* param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert before each element in the set of matched elements.
*/
- before(content1: JQuery|any[]|Element|DocumentFragment|Text|string, ...content2: any[]): JQuery;
+ before(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): JQuery;
/**
* Insert content, specified by the parameter, before each element in the set of matched elements.
*
@@ -2701,10 +2644,10 @@
/**
* Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.
*
- * param content1 DOM element, DocumentFragment, array of elements, HTML string, or jQuery object to insert at the beginning of each element in the set of matched elements.
+ * param content1 DOM element, array of elements, HTML string, or jQuery object to insert at the beginning of each element in the set of matched elements.
* param content2 One or more additional DOM elements, arrays of elements, HTML strings, or jQuery objects to insert at the beginning of each element in the set of matched elements.
*/
- prepend(content1: JQuery|any[]|Element|DocumentFragment|Text|string, ...content2: any[]): JQuery;
+ prepend(content1: JQuery|any[]|Element|Text|string, ...content2: any[]): JQuery;
/**
* Insert content, specified by the parameter, to the beginning of each element in the set of matched elements.
*
@@ -2765,9 +2708,8 @@
/**
* Retrieve all the elements contained in the jQuery set, as an array.
- * @name toArray
*/
- toArray(): HTMLElement[];
+ toArray(): any[];
/**
* Remove the parents of the set of matched elements from the DOM, leaving the matched elements in their place.
@@ -2823,9 +2765,8 @@
get(index: number): HTMLElement;
/**
* Retrieve the elements matched by the jQuery object.
- * @alias toArray
*/
- get(): HTMLElement[];
+ get(): any[];
/**
* Search for a given element from among the matched elements.