avatars_for_rails 0.2.2 → 0.2.3

data/vendor/assets/javascripts/jquery.fileupload.js

@@ -1,89 +1,156 @@
 /*
- * jQuery File Upload Plugin 3.4
+ * jQuery File Upload Plugin 4.4.2
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2010, Sebastian Tschan
+ * https://blueimp.net
  *
- * Copyright 2010, Sebastian Tschan, AQUANTUM
  * Licensed under the MIT license:
  * http://creativecommons.org/licenses/MIT/
- *
- * https://blueimp.net
- * http://www.aquantum.de
  */
 
 /*jslint browser: true */
-/*global File, FileReader, FormData, unescape, jQuery */
+/*global XMLHttpRequestUpload, File, FileReader, FormData, ProgressEvent, unescape, jQuery, upload */
 
 (function ($) {
+    'use strict';
 
-    var FileUpload,
-        methods;
+    var defaultNamespace = 'file_upload',
+        undef = 'undefined',
+        func = 'function',
+        FileUpload,
+        methods,
+
+        MultiLoader = function (callBack, numOrList) {
+            var loaded = 0,
+                list = [];
+            if (numOrList) {
+                if (numOrList.length) {
+                    list = numOrList;
+                } else {
+                    list[numOrList - 1] = null;
+                }
+            }
+            this.complete = function () {
+                loaded += 1;
+                if (loaded === list.length) {
+                    callBack(list);
+                    loaded = 0;
+                    list = [];
+                }
+            };
+            this.push = function (item) {
+                list.push(item);
+            };
+            this.getList = function () {
+                return list;
+            };
+        },
+        
+        SequenceHandler = function () {
+            var sequence = [];
+            this.push = function (callBack) {
+                sequence.push(callBack);
+                if (sequence.length === 1) {
+                    callBack();
+                }
+            };
+            this.next = function () {
+                sequence.shift();
+                if (sequence.length) {
+                    sequence[0]();
+                }
+            };
+        };
         
     FileUpload = function (container) {
         var fileUpload = this,
-            uploadForm = (container.is('form') ? container : container.find('form').first()),
-            fileInput = uploadForm.find('input:file').first(),
+            uploadForm,
+            fileInput,
             settings = {
-                namespace: 'file_upload',
-                cssClass: 'file_upload',
+                namespace: defaultNamespace,
+                uploadFormFilter: function (index) {
+                    return true;
+                },
+                fileInputFilter: function (index) {
+                    return true;
+                },
+                cssClass: defaultNamespace,
                 dragDropSupport: true,
                 dropZone: container,
-                url: uploadForm.attr('action'),
-                method: uploadForm.attr('method'),
-                fieldName: fileInput.attr('name'),
+                url: function (form) {
+                    return form.attr('action');
+                },
+                method: function (form) {
+                    return form.attr('method');
+                },
+                fieldName: function (input) {
+                    return input.attr('name');
+                },
+                formData: function (form) {
+                    return form.serializeArray();
+                },
+                requestHeaders: null,
                 multipart: true,
                 multiFileRequest: false,
-                formData: function () {
-                    return uploadForm.serializeArray();
-                },
                 withCredentials: false,
-                forceIframeUpload: false
+                forceIframeUpload: false,
+                sequentialUploads: false,
+                maxChunkSize: null,
+                maxFileReaderSize: 50000000
             },
             documentListeners = {},
             dropZoneListeners = {},
-            fileInputListeners = {},
-            undef = 'undefined',
-            func = 'function',
-            num = 'number',
             protocolRegExp = /^http(s)?:\/\//,
-
-            MultiLoader = function (callBack, numberComplete) {
-                var loaded = 0;
-                this.complete = function () {
-                    loaded += 1;
-                    if (loaded === numberComplete) {
-                        callBack();
-                    }
-                };
+            optionsReference,
+            multiLoader = new MultiLoader(function (list) {
+                if (typeof settings.onLoadAll === func) {
+                    settings.onLoadAll(list);
+                }
+            }),
+            sequenceHandler = new SequenceHandler(),
+            
+            completeNext = function () {
+                multiLoader.complete();
+                sequenceHandler.next();
             },
 
             isXHRUploadCapable = function () {
-                return typeof XMLHttpRequest !== undef && typeof File !== undef && (
-                    !settings.multipart || typeof FormData !== undef || typeof FileReader !== undef
-                );
+                return typeof XMLHttpRequest !== undef && typeof XMLHttpRequestUpload !== undef &&
+                    typeof File !== undef && (!settings.multipart || typeof FormData !== undef ||
+                    (typeof FileReader !== undef && typeof XMLHttpRequest.prototype.sendAsBinary === func));
             },
 
             initEventHandlers = function () {
                 if (settings.dragDropSupport) {
                     if (typeof settings.onDocumentDragEnter === func) {
-                        documentListeners['dragenter.' + settings.namespace] = settings.onDocumentDragEnter;
+                        documentListeners['dragenter.' + settings.namespace] = function (e) {
+                            settings.onDocumentDragEnter(e);
+                        };
                     }
                     if (typeof settings.onDocumentDragLeave === func) {
-                        documentListeners['dragleave.' + settings.namespace] = settings.onDocumentDragLeave;
+                        documentListeners['dragleave.' + settings.namespace] = function (e) {
+                            settings.onDocumentDragLeave(e);
+                        };
                     }
                     documentListeners['dragover.'   + settings.namespace] = fileUpload.onDocumentDragOver;
                     documentListeners['drop.'       + settings.namespace] = fileUpload.onDocumentDrop;
                     $(document).bind(documentListeners);
                     if (typeof settings.onDragEnter === func) {
-                        dropZoneListeners['dragenter.' + settings.namespace] = settings.onDragEnter;
+                        dropZoneListeners['dragenter.' + settings.namespace] = function (e) {
+                            settings.onDragEnter(e);
+                        };
                     }
                     if (typeof settings.onDragLeave === func) {
-                        dropZoneListeners['dragleave.' + settings.namespace] = settings.onDragLeave;
+                        dropZoneListeners['dragleave.' + settings.namespace] = function (e) {
+                            settings.onDragLeave(e);
+                        };
                     }
                     dropZoneListeners['dragover.'   + settings.namespace] = fileUpload.onDragOver;
                     dropZoneListeners['drop.'       + settings.namespace] = fileUpload.onDrop;
                     settings.dropZone.bind(dropZoneListeners);
                 }
-                fileInputListeners['change.'    + settings.namespace] = fileUpload.onChange;
-                fileInput.bind(fileInputListeners);
+                fileInput.bind('change.' + settings.namespace, fileUpload.onChange);
             },
 
             removeEventHandlers = function () {
@@ -93,41 +160,185 @@
                 $.each(dropZoneListeners, function (key, value) {
                     settings.dropZone.unbind(key, value);
                 });
-                $.each(fileInputListeners, function (key, value) {
-                    fileInput.unbind(key, value);
-                });
+                fileInput.unbind('change.' + settings.namespace);
             },
 
-            initUploadEventHandlers = function (files, index, xhr, settings) {
-                if (typeof settings.onProgress === func) {
-                    xhr.upload.onprogress = function (e) {
-                        settings.onProgress(e, files, index, xhr, settings);
+            isChunkedUpload = function (settings) {
+                return typeof settings.uploadedBytes !== undef;
+            },
+
+            createProgressEvent = function (lengthComputable, loaded, total) {
+                var event;
+                if (typeof document.createEvent === func && typeof ProgressEvent !== undef) {
+                    event = document.createEvent('ProgressEvent');
+                    event.initProgressEvent(
+                        'progress',
+                        false,
+                        false,
+                        lengthComputable,
+                        loaded,
+                        total
+                    );
+                } else {
+                    event = {
+                        lengthComputable: true,
+                        loaded: loaded,
+                        total: total
                     };
                 }
+                return event;
+            },
+
+            getProgressTotal = function (files, index, settings) {
+                var i,
+                    total;
+                if (typeof settings.progressTotal === undef) {
+                    if (files[index]) {
+                        total = files[index].size;
+                        settings.progressTotal = total ? total : 1;
+                    } else {
+                        total = 0;
+                        for (i = 0; i < files.length; i += 1) {
+                            total += files[i].size;
+                        }
+                        settings.progressTotal = total;
+                    }
+                }
+                return settings.progressTotal;
+            },
+
+            handleGlobalProgress = function (event, files, index, xhr, settings) {
+                var progressEvent,
+                    loaderList,
+                    globalLoaded = 0,
+                    globalTotal = 0;
+                if (event.lengthComputable && typeof settings.onProgressAll === func) {
+                    settings.progressLoaded = parseInt(
+                        event.loaded / event.total * getProgressTotal(files, index, settings),
+                        10
+                    );
+                    loaderList = multiLoader.getList();
+                    $.each(loaderList, function (index, item) {
+                        // item is an array with [files, index, xhr, settings]
+                        globalLoaded += item[3].progressLoaded || 0;
+                        globalTotal += getProgressTotal(item[0], item[1], item[3]);
+                    });
+                    progressEvent = createProgressEvent(
+                        true,
+                        globalLoaded,
+                        globalTotal
+                    );
+                    settings.onProgressAll(progressEvent, loaderList);
+                }
+            },
+            
+            handleLoadEvent = function (event, files, index, xhr, settings) {
+                var progressEvent;
+                if (isChunkedUpload(settings)) {
+                    settings.uploadedBytes += settings.chunkSize;
+                    progressEvent = createProgressEvent(
+                        true,
+                        settings.uploadedBytes,
+                        files[index].size
+                    );
+                    if (typeof settings.onProgress === func) {
+                        settings.onProgress(progressEvent, files, index, xhr, settings);
+                    }
+                    handleGlobalProgress(progressEvent, files, index, xhr, settings);
+                    if (settings.uploadedBytes < files[index].size) {
+                        if (typeof settings.resumeUpload === func) {
+                            settings.resumeUpload(
+                                event,
+                                files,
+                                index,
+                                xhr,
+                                settings,
+                                function () {
+                                    upload(event, files, index, xhr, settings, true);
+                                }
+                            );
+                        } else {
+                            upload(event, files, index, xhr, settings, true);
+                        }
+                        return;
+                    }
+                }
+                settings.progressLoaded = getProgressTotal(files, index, settings);
                 if (typeof settings.onLoad === func) {
-                    xhr.onload = function (e) {
-                        settings.onLoad(e, files, index, xhr, settings);
-                    };
+                    settings.onLoad(event, files, index, xhr, settings);
                 }
-                if (typeof settings.onAbort === func) {
-                    xhr.onabort = function (e) {
-                        settings.onAbort(e, files, index, xhr, settings);
+                completeNext();
+            },
+            
+            handleProgressEvent = function (event, files, index, xhr, settings) {
+                var progressEvent = event;
+                if (isChunkedUpload(settings) && event.lengthComputable) {
+                    progressEvent = createProgressEvent(
+                        true,
+                        settings.uploadedBytes + parseInt(event.loaded / event.total * settings.chunkSize, 10),
+                        files[index].size
+                    );
+                }
+                if (typeof settings.onProgress === func) {
+                    settings.onProgress(progressEvent, files, index, xhr, settings);
+                }
+                handleGlobalProgress(progressEvent, files, index, xhr, settings);
+            },
+            
+            initUploadEventHandlers = function (files, index, xhr, settings) {
+                if (xhr.upload) {
+                    xhr.upload.onprogress = function (e) {
+                        handleProgressEvent(e, files, index, xhr, settings);
                     };
                 }
-                if (typeof settings.onError === func) {
-                    xhr.onerror = function (e) {
+                xhr.onload = function (e) {
+                    handleLoadEvent(e, files, index, xhr, settings);
+                };
+                xhr.onabort = function (e) {
+                    settings.progressTotal = settings.progressLoaded;
+                    if (typeof settings.onAbort === func) {
+                        settings.onAbort(e, files, index, xhr, settings);
+                    }
+                    completeNext();
+                };
+                xhr.onerror = function (e) {
+                    settings.progressTotal = settings.progressLoaded;
+                    if (typeof settings.onError === func) {
                         settings.onError(e, files, index, xhr, settings);
-                    };
+                    }
+                    completeNext();
+                };
+            },
+
+            getUrl = function (settings) {
+                if (typeof settings.url === func) {
+                    return settings.url(settings.uploadForm || uploadForm);
+                }
+                return settings.url;
+            },
+            
+            getMethod = function (settings) {
+                if (typeof settings.method === func) {
+                    return settings.method(settings.uploadForm || uploadForm);
+                }
+                return settings.method;
+            },
+            
+            getFieldName = function (settings) {
+                if (typeof settings.fieldName === func) {
+                    return settings.fieldName(settings.fileInput || fileInput);
                 }
+                return settings.fieldName;
             },
 
             getFormData = function (settings) {
+                var formData;
                 if (typeof settings.formData === func) {
-                    return settings.formData();
+                    return settings.formData(settings.uploadForm || uploadForm);
                 } else if ($.isArray(settings.formData)) {
                     return settings.formData;
                 } else if (settings.formData) {
-                    var formData = [];
+                    formData = [];
                     $.each(settings.formData, function (name, value) {
                         formData.push({name: name, value: value});
                     });
@@ -151,12 +362,35 @@
                 return true;
             },
 
-            nonMultipartUpload = function (file, xhr, sameDomain) {
+            initUploadRequest = function (files, index, xhr, settings) {
+                var file = files[index],
+                    url = getUrl(settings),
+                    sameDomain = isSameDomain(url);
+                xhr.open(getMethod(settings), url, true);
                 if (sameDomain) {
-                    xhr.setRequestHeader('X-File-Name', unescape(encodeURIComponent(file.name)));
+                    xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+                    if (!settings.multipart || isChunkedUpload(settings)) {
+                        xhr.setRequestHeader('X-File-Name', file.name);
+                        xhr.setRequestHeader('X-File-Type', file.type);
+                        xhr.setRequestHeader('X-File-Size', file.size);
+                        if (!isChunkedUpload(settings)) {
+                            xhr.setRequestHeader('Content-Type', file.type);
+                        } else if (!settings.multipart) {
+                            xhr.setRequestHeader('Content-Type', 'application/octet-stream');
+                        }
+                    }
+                } else if (settings.withCredentials) {
+                    xhr.withCredentials = true;
+                }
+                if ($.isArray(settings.requestHeaders)) {
+                    $.each(settings.requestHeaders, function (index, header) {
+                        xhr.setRequestHeader(header.name, header.value);
+                    });
+                } else if (settings.requestHeaders) {
+                    $.each(settings.requestHeaders, function (name, value) {
+                        xhr.setRequestHeader(name, value);
+                    });
                 }
-                xhr.setRequestHeader('Content-Type', file.type);
-                xhr.send(file);
             },
 
             formDataUpload = function (files, xhr, settings) {
@@ -166,41 +400,47 @@
                     formData.append(field.name, field.value);
                 });
                 for (i = 0; i < files.length; i += 1) {
-                    formData.append(settings.fieldName, files[i]);
+                    formData.append(getFieldName(settings), files[i]);
                 }
                 xhr.send(formData);
             },
 
             loadFileContent = function (file, callBack) {
-                var fileReader = new FileReader();
-                fileReader.onload = function (e) {
-                    file.content = e.target.result;
-                    callBack();
-                };
-                fileReader.readAsBinaryString(file);
+                file.reader = new FileReader();
+                file.reader.onload = callBack;
+                file.reader.readAsBinaryString(file);
             },
 
-            buildMultiPartFormData = function (boundary, files, fields) {
+            utf8encode = function (str) {
+                return unescape(encodeURIComponent(str));
+            },
+
+            buildMultiPartFormData = function (boundary, files, filesFieldName, fields) {
                 var doubleDash = '--',
                     crlf     = '\r\n',
-                    formData = '';
+                    formData = '',
+                    buffer = [];
                 $.each(fields, function (index, field) {
                     formData += doubleDash + boundary + crlf +
                         'Content-Disposition: form-data; name="' +
-                        unescape(encodeURIComponent(field.name)) +
+                        utf8encode(field.name) +
                         '"' + crlf + crlf +
-                        unescape(encodeURIComponent(field.value)) + crlf;
+                        utf8encode(field.value) + crlf;
                 });
                 $.each(files, function (index, file) {
                     formData += doubleDash + boundary + crlf +
                         'Content-Disposition: form-data; name="' +
-                        unescape(encodeURIComponent(settings.fieldName)) +
-                        '"; filename="' + unescape(encodeURIComponent(file.name)) + '"' + crlf +
-                        'Content-Type: ' + file.type + crlf + crlf +
-                        file.content + crlf;
+                        utf8encode(filesFieldName) +
+                        '"; filename="' + utf8encode(file.name) + '"' + crlf +
+                        'Content-Type: ' + utf8encode(file.type) + crlf + crlf;
+                    buffer.push(formData);
+                    buffer.push(file.reader.result);
+                    delete file.reader;
+                    formData = crlf;
                 });
                 formData += doubleDash + boundary + doubleDash + crlf;
-                return formData;
+                buffer.push(formData);
+                return buffer.join('');
             },
             
             fileReaderUpload = function (files, xhr, settings) {
@@ -212,6 +452,7 @@
                     xhr.sendAsBinary(buildMultiPartFormData(
                         boundary,
                         files,
+                        getFieldName(settings),
                         getFormData(settings)
                     ));
                 }, files.length);
@@ -220,67 +461,99 @@
                 }
             },
 
-            upload = function (files, index, xhr, settings) {
-                var sameDomain = isSameDomain(settings.url),
-                    filesToUpload;
-                initUploadEventHandlers(files, index, xhr, settings);
-                xhr.open(settings.method, settings.url, true);
-                if (sameDomain) {
-                    xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
-                } else if (settings.withCredentials) {
-                    xhr.withCredentials = true;
+            getBlob = function (file, settings) {
+                var blob,
+                    ub = settings.uploadedBytes,
+                    mcs = settings.maxChunkSize;
+                if (file && typeof file.slice === func && (ub || (mcs && mcs < file.size))) {
+                    settings.uploadedBytes = ub = ub || 0;
+                    blob = file.slice(ub, mcs || file.size - ub);
+                    settings.chunkSize = blob.size;
+                    return blob;
                 }
-                if (!settings.multipart) {
-                    nonMultipartUpload(files[index], xhr, sameDomain);
-                } else {
-                    if (typeof index === num) {
-                        filesToUpload = [files[index]];
-                    } else {
-                        filesToUpload = files;
+                return file;
+            },
+
+            upload = function (event, files, index, xhr, settings, nextChunk) {
+                var send;
+                send = function () {
+                    if (!nextChunk) {
+                        if (typeof settings.onSend === func &&
+                                settings.onSend(event, files, index, xhr, settings) === false) {
+                            completeNext();
+                            return;
+                        }
                     }
-                    if (typeof FormData !== undef) {
-                        formDataUpload(filesToUpload, xhr, settings);
-                    } else if (typeof FileReader !== undef) {
-                        fileReaderUpload(filesToUpload, xhr, settings);
+                    var blob = getBlob(files[index], settings),
+                        filesToUpload;
+                    initUploadEventHandlers(files, index, xhr, settings);
+                    initUploadRequest(files, index, xhr, settings);
+                    if (!settings.multipart) {
+                        if (xhr.upload) {
+                            xhr.send(blob);
+                        } else {
+                            $.error('Browser does not support XHR file uploads');
+                        }
                     } else {
-                        $.error('Browser does neither support FormData nor FileReader interface');
+                        filesToUpload = (typeof index === 'number') ? [blob] : files;
+                        if (typeof FormData !== undef) {
+                            formDataUpload(filesToUpload, xhr, settings);
+                        } else if (typeof FileReader !== undef && typeof xhr.sendAsBinary === func) {
+                            fileReaderUpload(filesToUpload, xhr, settings);
+                        } else {
+                            $.error('Browser does not support multipart/form-data XHR file uploads');
+                        }
+                    }
+                };
+                if (!nextChunk) {
+                    multiLoader.push(Array.prototype.slice.call(arguments, 1));
+                    if (settings.sequentialUploads) {
+                        sequenceHandler.push(send);
+                        return;
                     }
                 }
+                send();
             },
 
-            handleUpload = function (event, files, index) {
+            handleUpload = function (event, files, input, form, index) {
                 var xhr = new XMLHttpRequest(),
                     uploadSettings = $.extend({}, settings);
-                if (typeof settings.initUpload === func) {
-                    settings.initUpload(
+                uploadSettings.fileInput = input;
+                uploadSettings.uploadForm = form;
+                if (typeof uploadSettings.initUpload === func) {
+                    uploadSettings.initUpload(
                         event,
                         files,
                         index,
                         xhr,
                         uploadSettings,
                         function () {
-                            upload(files, index, xhr, uploadSettings);
+                            upload(event, files, index, xhr, uploadSettings);
                         }
                     );
                 } else {
-                    upload(files, index, xhr, uploadSettings);
+                    upload(event, files, index, xhr, uploadSettings);
                 }
             },
 
-            handleFiles = function (event, files) {
-                var i;
-                if (settings.multiFileRequest) {
-                    handleUpload(event, files);
+            handleLegacyGlobalProgress = function (event, files, index, iframe, settings) {
+                var total = 0,
+                    progressEvent;
+                if (typeof index === undef) {
+                    $.each(files, function (index, file) {
+                        total += file.size ? file.size : 1;
+                    });
                 } else {
-                    for (i = 0; i < files.length; i += 1) {
-                        handleUpload(event, files, i);
-                    }
+                    total = files[index].size ? files[index].size : 1;
                 }
+                progressEvent = createProgressEvent(true, total, total);
+                settings.progressLoaded = total;
+                handleGlobalProgress(progressEvent, files, index, iframe, settings);
             },
 
-            legacyUploadFormDataInit = function (input, settings) {
+            legacyUploadFormDataInit = function (input, form, settings) {
                 var formData = getFormData(settings);
-                uploadForm.find(':input').not(':disabled')
+                form.find(':input').not(':disabled')
                     .attr('disabled', true)
                     .addClass(settings.namespace + '_disabled');
                 $.each(formData, function (index, field) {
@@ -288,80 +561,165 @@
                         .attr('name', field.name)
                         .val(field.value)
                         .addClass(settings.namespace + '_form_data')
-                        .insertBefore(fileInput);
+                        .appendTo(form);
                 });
-                input.insertAfter(fileInput);
+                input
+                    .attr('name', getFieldName(settings))
+                    .appendTo(form);
             },
 
-            legacyUploadFormDataReset = function (input, settings) {
-                input.remove();
-                uploadForm.find('.' + settings.namespace + '_disabled')
+            legacyUploadFormDataReset = function (input, form, settings) {
+                input.detach();
+                form.find('.' + settings.namespace + '_disabled')
                     .removeAttr('disabled')
                     .removeClass(settings.namespace + '_disabled');
-                uploadForm.find('.' + settings.namespace + '_form_data').remove();
-            },
-
-            legacyUpload = function (input, iframe, settings) {
-                iframe
-                    .unbind('abort')
-                    .bind('abort', function (e) {
-                        iframe.readyState = 0;
-                        // javascript:false as iframe src prevents warning popups on HTTPS in IE6
-                        // concat is used here to prevent the "Script URL" JSLint error:
-                        iframe.unbind('load').attr('src', 'javascript'.concat(':false;'));
-                        if (typeof settings.onAbort === func) {
-                            settings.onAbort(e, [{name: input.val(), type: null, size: null}], 0, iframe, settings);
-                        }
-                    })
-                    .unbind('load')
-                    .bind('load', function (e) {
-                        iframe.readyState = 4;
-                        if (typeof settings.onLoad === func) {
-                            settings.onLoad(e, [{name: input.val(), type: null, size: null}], 0, iframe, settings);
-                        }
-                    });
-                uploadForm
-                    .attr('action', settings.url)
-                    .attr('target', iframe.attr('name'));
-                legacyUploadFormDataInit(input, settings);
-                iframe.readyState = 2;
-                uploadForm.get(0).submit();
-                legacyUploadFormDataReset(input, settings);
+                form.find('.' + settings.namespace + '_form_data').remove();
+            },
+
+            legacyUpload = function (event, files, input, form, iframe, settings, index) {
+                var send;
+                send = function () {
+                    if (typeof settings.onSend === func && settings.onSend(event, files, index, iframe, settings) === false) {
+                        completeNext();
+                        return;
+                    }
+                    var originalAction = form.attr('action'),
+                        originalMethod = form.attr('method'),
+                        originalTarget = form.attr('target');
+                    iframe
+                        .unbind('abort')
+                        .bind('abort', function (e) {
+                            iframe.readyState = 0;
+                            // javascript:false as iframe src prevents warning popups on HTTPS in IE6
+                            // concat is used here to prevent the "Script URL" JSLint error:
+                            iframe.unbind('load').attr('src', 'javascript'.concat(':false;'));
+                            handleLegacyGlobalProgress(e, files, index, iframe, settings);
+                            if (typeof settings.onAbort === func) {
+                                settings.onAbort(e, files, index, iframe, settings);
+                            }
+                            completeNext();
+                        })
+                        .unbind('load')
+                        .bind('load', function (e) {
+                            iframe.readyState = 4;
+                            handleLegacyGlobalProgress(e, files, index, iframe, settings);
+                            if (typeof settings.onLoad === func) {
+                                settings.onLoad(e, files, index, iframe, settings);
+                            }
+                            // Fix for IE endless progress bar activity bug
+                            // (happens on form submits to iframe targets):
+                            $('<iframe src="javascript:false;" style="display:none;"></iframe>')
+                                .appendTo(form).remove();
+                            completeNext();
+                        });
+                    form
+                        .attr('action', getUrl(settings))
+                        .attr('method', getMethod(settings))
+                        .attr('target', iframe.attr('name'));
+                    legacyUploadFormDataInit(input, form, settings);
+                    iframe.readyState = 2;
+                    form.get(0).submit();
+                    legacyUploadFormDataReset(input, form, settings);
+                    form
+                        .attr('action', originalAction)
+                        .attr('method', originalMethod)
+                        .attr('target', originalTarget);
+                };
+                multiLoader.push([files, index, iframe, settings]);
+                if (settings.sequentialUploads) {
+                    sequenceHandler.push(send);
+                } else {
+                    send();
+                }
             },
 
-            handleLegacyUpload = function (event, input) {
+            handleLegacyUpload = function (event, input, form, index) {
+                if (!(event && input && form)) {
+                    $.error('Iframe based File Upload requires a file input change event');
+                    return;
+                }
                 // javascript:false as iframe src prevents warning popups on HTTPS in IE6:
-                var iframe = $('<iframe src="javascript:false;" style="display:none" name="iframe_' +
+                var iframe = $('<iframe src="javascript:false;" style="display:none;" name="iframe_' +
                     settings.namespace + '_' + (new Date()).getTime() + '"></iframe>'),
-                    uploadSettings = $.extend({}, settings);
+                    uploadSettings = $.extend({}, settings),
+                    files = event.target && event.target.files;
+                files = files ? Array.prototype.slice.call(files, 0) : [{name: input.val(), type: null, size: null}];
+                index = files.length === 1 ? 0 : index;
+                uploadSettings.fileInput = input;
+                uploadSettings.uploadForm = form;
                 iframe.readyState = 0;
                 iframe.abort = function () {
                     iframe.trigger('abort');
                 };
                 iframe.bind('load', function () {
                     iframe.unbind('load');
-                    if (typeof settings.initUpload === func) {
-                        settings.initUpload(
+                    if (typeof uploadSettings.initUpload === func) {
+                        uploadSettings.initUpload(
                             event,
-                            [{name: input.val(), type: null, size: null}],
-                            0,
+                            files,
+                            index,
                             iframe,
                             uploadSettings,
                             function () {
-                                legacyUpload(input, iframe, uploadSettings);
+                                legacyUpload(event, files, input, form, iframe, uploadSettings, index);
                             }
                         );
                     } else {
-                        legacyUpload(input, iframe, uploadSettings);
+                        legacyUpload(event, files, input, form, iframe, uploadSettings, index);
+                    }
+                }).appendTo(form);
+            },
+
+            canHandleXHRUploadSize = function (files) {
+                var bytes = 0,
+                    totalBytes = 0,
+                    i;
+                if (settings.multipart && typeof FormData === undef) {
+                    for (i = 0; i < files.length; i += 1) {
+                        bytes = files[i].size;
+                        if (bytes > settings.maxFileReaderSize) {
+                            return false;
+                        }
+                        totalBytes += bytes;
+                    }
+                    if (settings.multiFileRequest && totalBytes > settings.maxFileReaderSize) {
+                        return false;
                     }
-                }).appendTo(uploadForm);
+                }
+                return true;
             },
 
-            resetFileInput = function () {
-                var inputClone = fileInput.clone(true);
+            handleFiles = function (event, files, input, form) {
+                if (!canHandleXHRUploadSize(files)) {
+                    handleLegacyUpload(event, input, form);
+                    return;
+                }
+                var i;
+                files = Array.prototype.slice.call(files, 0);
+                if (settings.multiFileRequest && settings.multipart && files.length) {
+                    handleUpload(event, files, input, form);
+                } else {
+                    for (i = 0; i < files.length; i += 1) {
+                        handleUpload(event, files, input, form, i);
+                    }
+                }
+            },
+            
+            initUploadForm = function () {
+                uploadForm = (container.is('form') ? container : container.find('form'))
+                    .filter(settings.uploadFormFilter);
+            },
+            
+            initFileInput = function () {
+                fileInput = (uploadForm.length ? uploadForm : container).find('input:file')
+                    .filter(settings.fileInputFilter);
+            },
+            
+            replaceFileInput = function (input) {
+                var inputClone = input.clone(true);
                 $('<form/>').append(inputClone).get(0).reset();
-                fileInput.replaceWith(inputClone);
-                fileInput = inputClone;
+                input.after(inputClone).detach();
+                initFileInput();
             };
 
         this.onDocumentDragOver = function (e) {
@@ -386,10 +744,10 @@
                 return false;
             }
             var dataTransfer = e.originalEvent.dataTransfer;
-            if (dataTransfer) {
+            if (dataTransfer && dataTransfer.files) {
                 dataTransfer.dropEffect = dataTransfer.effectAllowed = 'copy';
+                e.preventDefault();
             }
-            e.preventDefault();
         };
 
         this.onDrop = function (e) {
@@ -409,18 +767,28 @@
                     settings.onChange(e) === false) {
                 return false;
             }
+            var input = $(e.target),
+                form = $(e.target.form);
+            if (form.length === 1) {
+                input.data(defaultNamespace + '_form', form);
+                replaceFileInput(input);
+            } else {
+                form = input.data(defaultNamespace + '_form');
+            }
             if (!settings.forceIframeUpload && e.target.files && isXHRUploadCapable()) {
-                handleFiles(e, e.target.files);
+                handleFiles(e, e.target.files, input, form);
             } else {
-                handleLegacyUpload(e, $(e.target));
+                handleLegacyUpload(e, input, form);
             }
-            resetFileInput();
         };
 
         this.init = function (options) {
             if (options) {
                 $.extend(settings, options);
+                optionsReference = options;
             }
+            initUploadForm();
+            initFileInput();
             if (container.data(settings.namespace)) {
                 $.error('FileUpload with namespace "' + settings.namespace + '" already assigned to this element');
                 return;
@@ -428,16 +796,92 @@
             container
                 .data(settings.namespace, fileUpload)
                 .addClass(settings.cssClass);
-            settings.dropZone.addClass(settings.cssClass);
+            settings.dropZone.not(container).addClass(settings.cssClass);
+            initEventHandlers();
+            if (typeof settings.init === func) {
+                settings.init();
+            }
+        };
+
+        this.options = function (options) {
+            var oldCssClass,
+                oldDropZone,
+                uploadFormFilterUpdate,
+                fileInputFilterUpdate;
+            if (typeof options === undef) {
+                return $.extend({}, settings);
+            }
+            if (optionsReference) {
+                $.extend(optionsReference, options);
+            }
+            removeEventHandlers();
+            $.each(options, function (name, value) {
+                switch (name) {
+                case 'namespace':
+                    $.error('The FileUpload namespace cannot be updated.');
+                    return;
+                case 'uploadFormFilter':
+                    uploadFormFilterUpdate = true;
+                    fileInputFilterUpdate = true;
+                    break;
+                case 'fileInputFilter':
+                    fileInputFilterUpdate = true;
+                    break;
+                case 'cssClass':
+                    oldCssClass = settings.cssClass;
+                    break;
+                case 'dropZone':
+                    oldDropZone = settings.dropZone;
+                    break;
+                }
+                settings[name] = value;
+            });
+            if (uploadFormFilterUpdate) {
+                initUploadForm();
+            }
+            if (fileInputFilterUpdate) {
+                initFileInput();
+            }
+            if (typeof oldCssClass !== undef) {
+                container
+                    .removeClass(oldCssClass)
+                    .addClass(settings.cssClass);
+                (oldDropZone ? oldDropZone : settings.dropZone).not(container)
+                    .removeClass(oldCssClass);
+                settings.dropZone.not(container).addClass(settings.cssClass);
+            } else if (oldDropZone) {
+                oldDropZone.not(container).removeClass(settings.cssClass);
+                settings.dropZone.not(container).addClass(settings.cssClass);
+            }
             initEventHandlers();
         };
         
+        this.option = function (name, value) {
+            var options;
+            if (typeof value === undef) {
+                return settings[name];
+            }
+            options = {};
+            options[name] = value;
+            fileUpload.options(options);
+        };
+        
         this.destroy = function () {
+            if (typeof settings.destroy === func) {
+                settings.destroy();
+            }
             removeEventHandlers();
             container
                 .removeData(settings.namespace)
                 .removeClass(settings.cssClass);
-            settings.dropZone.removeClass(settings.cssClass);
+            settings.dropZone.not(container).removeClass(settings.cssClass);
+        };
+        
+        this.upload = function (files) {
+            if (typeof files.length === undef) {
+                files = [files];
+            }
+            handleFiles(null, files);
         };
     };
 
@@ -447,10 +891,36 @@
                 (new FileUpload($(this))).init(options);
             });
         },
+        
+        option: function (option, value, namespace) {
+            namespace = namespace ? namespace : defaultNamespace;
+            var fileUpload = $(this).data(namespace);
+            if (fileUpload) {
+                if (!option) {
+                    return fileUpload.options();
+                } else if (typeof option === 'string' && typeof value === undef) {
+                    return fileUpload.option(option);
+                }
+            } else {
+                $.error('No FileUpload with namespace "' + namespace + '" assigned to this element');
+            }
+            return this.each(function () {
+                var fu = $(this).data(namespace);
+                if (fu) {
+                    if (typeof option === 'string') {
+                        fu.option(option, value);
+                    } else {
+                        fu.options(option);
+                    }
+                } else {
+                    $.error('No FileUpload with namespace "' + namespace + '" assigned to this element');
+                }
+            });
+        },
                 
-        destroy : function (namespace) {
+        destroy: function (namespace) {
+            namespace = namespace ? namespace : defaultNamespace;
             return this.each(function () {
-                namespace = namespace ? namespace : 'file_upload';
                 var fileUpload = $(this).data(namespace);
                 if (fileUpload) {
                     fileUpload.destroy();
@@ -458,7 +928,18 @@
                     $.error('No FileUpload with namespace "' + namespace + '" assigned to this element');
                 }
             });
-
+        },
+        
+        upload: function (files, namespace) {
+            namespace = namespace ? namespace : defaultNamespace;
+            return this.each(function () {
+                var fileUpload = $(this).data(namespace);
+                if (fileUpload) {
+                    fileUpload.upload(files);
+                } else {
+                    $.error('No FileUpload with namespace "' + namespace + '" assigned to this element');
+                }
+            });
         }
     };
     
@@ -468,7 +949,7 @@
         } else if (typeof method === 'object' || !method) {
             return methods.init.apply(this, arguments);
         } else {
-            $.error('Method ' + method + ' does not exist on jQuery.fileUpload');
+            $.error('Method "' + method + '" does not exist on jQuery.fileUpload');
         }
     };