Merge remote-tracking branch 'upstream/master' into merge_7_25

This commit is contained in:
Ryan Cavanaugh
2016-07-27 10:57:46 -07:00
312 changed files with 30700 additions and 5251 deletions

View File

@@ -17,13 +17,13 @@ interface JQueryFileInputOptions {
* The drop target element(s), by the default the complete document.
* Set to null to disable drag & drop support:
*/
dropZone?: HTMLElement;
dropZone?: Element | Element[] | JQuery | string;
/**
* The paste target element(s), by the default the complete document.
* Set to null to disable paste support:
*/
pasteZone?: HTMLElement;
pasteZone?: Element | Element[] | JQuery | string;
/**
* The file input field(s), that are listened to for change events.
@@ -31,7 +31,7 @@ interface JQueryFileInputOptions {
* of the widget element on plugin initialization.
* Set to null to disable the change listener.
*/
fileInput?: HTMLElement;
fileInput?: Element | Element[] | JQuery | string;
/**
* By default, the file input field is replaced with a clone after