diff --git a/app/assets/javascripts/hyrax.js b/app/assets/javascripts/hyrax.js
index 5e1cd7643f..b2ac1cffa0 100644
--- a/app/assets/javascripts/hyrax.js
+++ b/app/assets/javascripts/hyrax.js
@@ -22,9 +22,12 @@
 //= require action_cable
 
 //= require hyrax/monkey_patch_turbolinks
-//= require hyrax/fileupload
+// blueimp's standalone micro-templating helper, used by the permissions and
+// relationships editors (formerly loaded via the old upload widget)
+//= require fileupload/tmpl
 // Provide AMD module support
 //= require almond
+//= require hyrax/fileupload
 //= require hyrax/notification
 //= require hyrax/app
 //= require hyrax/config
diff --git a/app/assets/javascripts/hyrax/fileupload.js b/app/assets/javascripts/hyrax/fileupload.js
index 4fffedc21e..606913a4bb 100644
--- a/app/assets/javascripts/hyrax/fileupload.js
+++ b/app/assets/javascripts/hyrax/fileupload.js
@@ -1,8 +1,18 @@
 //= require hyrax/uploader
-// This file is the default initialization of the fileupload.  If you want to call
-// hyraxUploader with other options (like afterSubmit), then override this file.
+// This file is the default initialization of the file upload widgets. If you
+// want to initialize Hyrax.Uploader with other options, override this file.
 Blacklight.onLoad(function() {
-  var options = {};
-  $('#fileupload').hyraxUploader(options);
-  $('#fileuploadlogo').hyraxUploader({downloadTemplateId: 'logo-template-download'});
+  // expose the uploader for view-level initializers and overrides
+  window.Hyrax = window.Hyrax || {};
+  if (!window.Hyrax.Uploader) {
+    window.Hyrax.Uploader = require('hyrax/uploader').Uploader;
+  }
+
+  var main = document.getElementById('fileupload');
+  if (main && !main.hyraxUploader) { new Hyrax.Uploader(main, {}); }
+
+  var logo = document.getElementById('fileuploadlogo');
+  if (logo && !logo.hyraxUploader) {
+    new Hyrax.Uploader(logo, { rowTemplate: 'hyrax-upload-row-logo' });
+  }
 });
diff --git a/app/assets/javascripts/hyrax/save_work/uploaded_files.es6 b/app/assets/javascripts/hyrax/save_work/uploaded_files.es6
index 68882914a6..ae7da08d9e 100644
--- a/app/assets/javascripts/hyrax/save_work/uploaded_files.es6
+++ b/app/assets/javascripts/hyrax/save_work/uploaded_files.es6
@@ -12,6 +12,11 @@ export class UploadedFiles {
       this.uploadsInProgress -= 1
       callback(e, data)
     })
+    // canceled or errored uploads no longer count as in progress
+    this.element.on('fileuploadfail', (e, data) => {
+      this.uploadsInProgress -= 1
+      callback(e, data)
+    })
     this.element.on('fileuploaddestroyed', callback)
   }
 
diff --git a/app/assets/javascripts/hyrax/uploader.es6 b/app/assets/javascripts/hyrax/uploader.es6
new file mode 100644
index 0000000000..ca20f4bf09
--- /dev/null
+++ b/app/assets/javascripts/hyrax/uploader.es6
@@ -0,0 +1,502 @@
+// Hyrax.Uploader — dependency-free replacement for the vendored blueimp
+// jQuery-File-Upload widget.
+//
+// Speaks Hyrax's two-step staged upload protocol:
+//
+//   1. POST /uploads with `files[]=<filename>` pre-creates a
+//      Hyrax::UploadedFile record and returns its id;
+//   2. the file's bytes are POSTed with that `id`, split into sequential
+//      chunks with a Content-Range header when the file exceeds
+//      `maxChunkSize` — keeping each request small enough for proxies that
+//      cap request size (e.g. Cloudflare's 100 MB limit);
+//   3. completed uploads render a row from a server-side <template>
+//      element whose hidden input (uploaded_files[], banner_files[], ...)
+//      carries the staged file id when the enclosing form is submitted;
+//   4. removing a row DELETEs the staged record.
+//
+// Events are fired both as DOM CustomEvents (`hyrax:uploads:added`, etc.)
+// and, when jQuery is present, as the blueimp-era jQuery events
+// (`fileuploadadded`, `fileuploadcompleted`, `fileuploaddestroyed`,
+// `fileuploadfail`) that hyrax/save_work/uploaded_files.es6 listens to, so
+// the Save gate keeps working unchanged.
+//
+// Configuration comes from `Hyrax.config.uploader` (limitConcurrentUploads,
+// maxNumberOfFiles, maxFileSize), data attributes on the widget element
+// (`data-row-template`), and per-call options.
+
+const DEFAULTS = {
+  url: '/uploads/',
+  maxChunkSize: 10000000, // 10 MB chunks, as the blueimp widget used
+  limitConcurrentUploads: 6,
+  maxNumberOfFiles: 100,
+  maxFileSize: 500 * 1024 * 1024,
+  acceptFileTypes: null,        // e.g. /(\.|\/)(gif|jpe?g|png)$/i
+  rowTemplate: 'hyrax-upload-row',
+  messages: {
+    maxFileSize: 'File is too large',
+    minFileSize: 'File is too small',
+    acceptFileTypes: 'File type not allowed',
+    maxNumberOfFiles: 'Maximum number of files exceeded',
+    uploadFailed: 'Upload failed'
+  }
+};
+
+const csrfToken = function() {
+  const meta = document.querySelector('meta[name="csrf-token"]');
+  return meta ? meta.content : null;
+};
+
+const formatFileSize = function(bytes) {
+  if (typeof bytes !== 'number') { return ''; }
+  if (bytes >= 1000000000) { return (bytes / 1000000000).toFixed(2) + ' GB'; }
+  if (bytes >= 1000000) { return (bytes / 1000000).toFixed(2) + ' MB'; }
+  return (bytes / 1000).toFixed(2) + ' KB';
+};
+
+// One file's upload lifecycle: pre-create, chunked (or single-shot)
+// content upload, cancel/removal.
+class Upload {
+  constructor(uploader, file) {
+    this.uploader = uploader;
+    this.file = file;
+    this.id = null;
+    this.deleteUrl = null;
+    this.row = null;
+    this.xhr = null;
+    this.canceled = false;
+    this.loadedBase = 0; // bytes confirmed from completed chunks
+    this.loaded = 0;
+  }
+
+  start() {
+    return this.createRecord()
+      .then(() => this.sendContent())
+      .then((response) => this.complete(response))
+      .catch((error) => this.fail(error));
+  }
+
+  // step 1: register the filename, receiving the staged record id
+  createRecord() {
+    const params = new URLSearchParams();
+    params.append('files[]', this.file.name);
+
+    return fetch(this.uploader.options.url, {
+      method: 'POST',
+      body: params,
+      headers: { 'X-CSRF-Token': csrfToken(), 'Accept': 'application/json' },
+      credentials: 'same-origin'
+    }).then((response) => {
+      if (!response.ok) { throw new Error('HTTP ' + response.status); }
+      return response.json();
+    }).then((json) => {
+      const record = json.files[0];
+      this.id = record.id;
+      this.deleteUrl = record.deleteUrl;
+    });
+  }
+
+  // step 2: the bytes — sequential Content-Range chunks for large files
+  sendContent() {
+    const size = this.file.size;
+    const chunkSize = this.uploader.options.maxChunkSize;
+    if (!chunkSize || size <= chunkSize) { return this.sendChunk(0, size, false); }
+
+    let sequence = Promise.resolve();
+    for (let start = 0; start < size; start += chunkSize) {
+      const end = Math.min(start + chunkSize, size);
+      sequence = sequence.then((response) => {
+        this.loadedBase = start;
+        return this.sendChunk(start, end, true).then((chunkResponse) => chunkResponse || response);
+      });
+    }
+    return sequence;
+  }
+
+  sendChunk(start, end, ranged) {
+    if (this.canceled) { return Promise.reject(new Error('canceled')); }
+
+    return new Promise((resolve, reject) => {
+      const xhr = new XMLHttpRequest();
+      this.xhr = xhr;
+      const blob = (start === 0 && end === this.file.size) ? this.file : this.file.slice(start, end);
+      const data = new FormData();
+      data.append('id', this.id);
+      data.append('files[]', blob, this.file.name);
+
+      xhr.open('POST', this.uploader.options.url);
+      xhr.setRequestHeader('X-CSRF-Token', csrfToken());
+      xhr.setRequestHeader('Accept', 'application/json');
+      if (ranged) {
+        xhr.setRequestHeader('Content-Range', 'bytes ' + start + '-' + (end - 1) + '/' + this.file.size);
+      }
+
+      xhr.upload.addEventListener('progress', (event) => {
+        if (event.lengthComputable) {
+          this.loaded = this.loadedBase + Math.min(event.loaded, end - start);
+          this.uploader.progressChanged(this);
+        }
+      });
+      xhr.addEventListener('load', () => {
+        if (xhr.status >= 200 && xhr.status < 300) {
+          this.loaded = this.loadedBase + (end - start);
+          this.uploader.progressChanged(this);
+          resolve(xhr.responseText);
+        } else {
+          reject(new Error('HTTP ' + xhr.status));
+        }
+      });
+      xhr.addEventListener('error', () => reject(new Error('network error')));
+      xhr.addEventListener('abort', () => reject(new Error('canceled')));
+      xhr.send(data);
+    });
+  }
+
+  complete(responseText) {
+    let record = { id: this.id, name: this.file.name, size: this.file.size, deleteUrl: this.deleteUrl };
+    try {
+      const parsed = JSON.parse(responseText);
+      if (parsed && parsed.files && parsed.files[0]) { record = parsed.files[0]; }
+    } catch (e) { /* keep locally-known attributes */ }
+    this.uploader.uploadCompleted(this, record);
+  }
+
+  fail(error) {
+    if (this.canceled || (error && error.message === 'canceled')) {
+      this.uploader.uploadCanceled(this);
+    } else {
+      this.uploader.uploadFailed(this, error);
+    }
+  }
+
+  cancel() {
+    this.canceled = true;
+    if (this.xhr) { this.xhr.abort(); }
+    this.destroyRecord();
+  }
+
+  destroyRecord() {
+    if (!this.deleteUrl) { return Promise.resolve(); }
+    return fetch(this.deleteUrl, {
+      method: 'DELETE',
+      headers: { 'X-CSRF-Token': csrfToken() },
+      credentials: 'same-origin'
+    });
+  }
+}
+
+class Uploader {
+  // @param element [HTMLElement] the widget container (e.g. #fileupload)
+  // @param options [Object] overrides merged over Hyrax.config.uploader
+  constructor(element, options) {
+    this.element = element;
+    const configured = (window.Hyrax && window.Hyrax.config && window.Hyrax.config.uploader) || {};
+    this.options = Object.assign({}, DEFAULTS, configured, options || {});
+    this.options.messages = Object.assign({}, DEFAULTS.messages, configured.messages || {}, (options || {}).messages || {});
+    if (element.dataset.rowTemplate) { this.options.rowTemplate = element.dataset.rowTemplate; }
+
+    this.uploads = [];
+    this.queue = [];
+    this.active = 0;
+
+    element.hyraxUploader = this;
+    this.bindInputs();
+    this.bindDropzone();
+    this.bindButtons();
+
+    // widgets whose file input is not `multiple` (versioning, collection
+    // banner) hold a single staged file: a new upload replaces the row
+    if (this.options.singleFile === undefined) {
+      const inputs = element.querySelectorAll('input[type="file"][name="files[]"]');
+      this.options.singleFile = inputs.length > 0 &&
+        !Array.prototype.some.call(inputs, (input) => input.hasAttribute('multiple'));
+    }
+    // elements to clear when a new upload begins (e.g. the currently
+    // attached banner and its banner_unchanged input); from
+    // data-upload-clear="<selector>"
+    this.clearSelector = element.dataset.uploadClear;
+  }
+
+  // ---- wiring -----------------------------------------------------------
+
+  bindInputs() {
+    this.element.querySelectorAll('input[type="file"][name="files[]"]').forEach((input) => {
+      input.addEventListener('change', () => {
+        let files = Array.prototype.slice.call(input.files);
+        if (files.length > 1 && !input.hasAttribute('multiple')) { files = files.slice(0, 1); }
+        this.addFiles(files);
+        input.value = '';
+      });
+    });
+  }
+
+  bindDropzone() {
+    const dropzone = this.element.querySelector('.dropzone');
+    if (!dropzone) { return; }
+
+    ['dragover', 'dragenter'].forEach((name) => {
+      dropzone.addEventListener(name, (event) => {
+        event.preventDefault();
+        dropzone.classList.add('hover');
+      });
+    });
+    dropzone.addEventListener('dragleave', () => dropzone.classList.remove('hover'));
+    dropzone.addEventListener('drop', (event) => {
+      event.preventDefault();
+      dropzone.classList.remove('hover');
+      if (event.dataTransfer && event.dataTransfer.files) {
+        this.addFiles(Array.prototype.slice.call(event.dataTransfer.files));
+      }
+    });
+    // highlight the dropzone while anything drags over the page
+    document.addEventListener('dragover', () => {
+      dropzone.classList.add('in');
+      if (this._dropTimeout) { clearTimeout(this._dropTimeout); }
+      this._dropTimeout = setTimeout(() => dropzone.classList.remove('in', 'hover'), 100);
+    });
+  }
+
+  bindButtons() {
+    // widget-level cancel (e.g. the work form's reset button)
+    this.element.querySelectorAll('button.cancel').forEach((button) => {
+      if (button.closest('tr, .template-download')) { return; }
+      button.addEventListener('click', () => this.cancelAll());
+    });
+  }
+
+  // ---- public API --------------------------------------------------------
+
+  // switch which <template> renders completed rows (used by the batch form)
+  setRowTemplate(templateId) {
+    this.options.rowTemplate = templateId;
+  }
+
+  addFiles(files) {
+    files.forEach((file) => this.add(file));
+  }
+
+  add(file) {
+    if (this.options.singleFile) { this.replaceExisting(); }
+    const error = this.validate(file);
+    const upload = new Upload(this, file);
+    upload.row = this.buildRow(upload);
+    this.uploads.push(upload);
+    this.fire('added', { files: [file] });
+
+    if (error) {
+      this.uploadFailed(upload, new Error(error));
+      return;
+    }
+    this.queue.push(upload);
+    this.pump();
+  }
+
+  cancelAll() {
+    this.queue = [];
+    this.uploads.forEach((upload) => {
+      if (!upload.finished) { upload.cancel(); }
+    });
+  }
+
+  // single-file widgets: drop any current upload/row (and, on the first
+  // upload, any server-rendered current-file markup) before a new one
+  replaceExisting() {
+    this.queue = [];
+    this.uploads.forEach((upload) => {
+      if (!upload.finished) {
+        upload.cancel();
+      } else if (upload.row) {
+        this.detachRow(upload);
+      }
+    });
+    if (this.clearSelector) {
+      this.element.querySelectorAll(this.clearSelector).forEach((node) => node.parentNode.removeChild(node));
+    }
+  }
+
+  // ---- queue -------------------------------------------------------------
+
+  pump() {
+    while (this.active < this.options.limitConcurrentUploads && this.queue.length > 0) {
+      const upload = this.queue.shift();
+      if (this.active === 0 && !this.batchRunning) {
+        this.batchRunning = true;
+        this.fire('start', {});
+      }
+      this.active += 1;
+      upload.start().then(() => {
+        this.active -= 1;
+        this.pump();
+      });
+    }
+    if (this.batchRunning && this.active === 0 && this.queue.length === 0) {
+      this.batchRunning = false;
+      this.fire('stop', {});
+    }
+  }
+
+  // ---- validation --------------------------------------------------------
+
+  validate(file) {
+    const messages = this.options.messages;
+    if (this.options.maxNumberOfFiles &&
+        this.completedOrActiveCount() >= this.options.maxNumberOfFiles) { return messages.maxNumberOfFiles; }
+    if (this.options.maxFileSize && file.size > this.options.maxFileSize) { return messages.maxFileSize; }
+    if (this.options.acceptFileTypes &&
+        !(this.options.acceptFileTypes.test(file.type) || this.options.acceptFileTypes.test(file.name))) {
+      return messages.acceptFileTypes;
+    }
+    return null;
+  }
+
+  completedOrActiveCount() {
+    return this.uploads.filter((upload) => !upload.failed).length;
+  }
+
+  // ---- row rendering -----------------------------------------------------
+
+  template() {
+    const template = document.getElementById(this.options.rowTemplate);
+    if (!template) { throw new Error('Missing upload row template #' + this.options.rowTemplate); }
+    return template;
+  }
+
+  filesContainer() {
+    return this.element.querySelector('.files');
+  }
+
+  buildRow(upload) {
+    const fragment = this.template().content.cloneNode(true);
+    const row = fragment.firstElementChild;
+
+    this.fill(row, '[data-upload-name]', upload.file.name);
+    this.fill(row, '[data-upload-size]', formatFileSize(upload.file.size));
+
+    const cancel = row.querySelector('[data-upload-cancel]');
+    if (cancel) { cancel.addEventListener('click', () => this.removeUpload(upload)); }
+
+    this.filesContainer().appendChild(fragment);
+    return row;
+  }
+
+  fill(row, selector, value) {
+    const node = row.querySelector(selector);
+    if (node) { node.textContent = value; }
+  }
+
+  progressChanged(upload) {
+    if (upload.row) {
+      const bar = upload.row.querySelector('[data-upload-progress]');
+      if (bar) { bar.style.width = Math.round((upload.loaded / upload.file.size) * 100) + '%'; }
+    }
+    this.updateGlobalProgress();
+  }
+
+  updateGlobalProgress() {
+    const container = this.element.querySelector('.fileupload-progress');
+    if (!container) { return; }
+    const bar = container.querySelector('.progress-bar');
+    const pending = this.uploads.filter((upload) => !upload.failed && !upload.canceled);
+    const total = pending.reduce((sum, upload) => sum + upload.file.size, 0);
+    const loaded = pending.reduce((sum, upload) => sum + (upload.finished ? upload.file.size : upload.loaded), 0);
+
+    const finished = pending.every((upload) => upload.finished);
+    container.classList.toggle('in', !finished);
+    if (bar && total > 0) { bar.style.width = Math.round((loaded / total) * 100) + '%'; }
+  }
+
+  // finalize a row: reveal the hidden id input, wire deletion
+  uploadCompleted(upload, record) {
+    upload.finished = true;
+    const row = upload.row;
+
+    // form inputs are authored nameless (their name is carried in
+    // data-upload-field-name) so an in-flight row neither satisfies the
+    // required-files gate nor submits partial values; name them now
+    row.querySelectorAll('[data-upload-field-name]').forEach((input) => {
+      input.name = input.dataset.uploadFieldName;
+    });
+    const idInput = row.querySelector('input[data-upload-id-input]');
+    if (idInput) { idInput.value = record.id; }
+    // batch/versioning templates parameterize input names with {{id}}
+    row.querySelectorAll('[name*="{{id}}"], [id*="{{id}}"], [for*="{{id}}"], [data-file-id*="{{id}}"]').forEach((node) => {
+      ['name', 'id', 'for', 'data-file-id'].forEach((attribute) => {
+        const value = node.getAttribute(attribute);
+        if (value && value.indexOf('{{id}}') !== -1) { node.setAttribute(attribute, value.split('{{id}}').join(record.id)); }
+      });
+    });
+
+    // inputs that default to the filename (batch per-file title)
+    row.querySelectorAll('[data-upload-name-value]').forEach((input) => {
+      if (!input.value) { input.value = record.name || upload.file.name; }
+    });
+
+    const progress = row.querySelector('[data-upload-progress]');
+    if (progress) {
+      progress.style.width = '100%';
+      const wrapper = progress.closest('.progress');
+      if (wrapper) { wrapper.classList.add('upload-complete'); }
+    }
+
+    const cancel = row.querySelector('[data-upload-cancel]');
+    if (cancel) { cancel.hidden = true; }
+    const remove = row.querySelector('[data-upload-delete]');
+    if (remove) {
+      remove.hidden = false;
+      remove.setAttribute('data-url', record.deleteUrl || upload.deleteUrl || '');
+      remove.addEventListener('click', () => this.removeUpload(upload));
+    }
+
+    this.updateGlobalProgress();
+    this.fire('completed', { files: [record], result: { files: [record] } });
+  }
+
+  uploadFailed(upload, error) {
+    upload.failed = true;
+    upload.finished = true;
+    if (upload.row) {
+      this.fill(upload.row, '[data-upload-error]', (error && error.message) || this.options.messages.uploadFailed);
+      const cancel = upload.row.querySelector('[data-upload-cancel]');
+      if (cancel) { cancel.hidden = false; }
+    }
+    this.updateGlobalProgress();
+    this.fire('fail', { files: [upload.file], error: error });
+  }
+
+  uploadCanceled(upload) {
+    upload.canceled = true;
+    upload.finished = true;
+    this.detachRow(upload);
+    this.updateGlobalProgress();
+    this.fire('fail', { files: [upload.file], canceled: true });
+  }
+
+  // remove a pending or completed upload: abort/delete server side, drop
+  // the row (and its hidden input) client side
+  removeUpload(upload) {
+    if (!upload.finished) {
+      upload.cancel(); // fires 'fail' via the abort path
+      return;
+    }
+    upload.destroyRecord();
+    this.detachRow(upload);
+    this.fire('destroyed', { files: [{ id: upload.id }] });
+  }
+
+  detachRow(upload) {
+    if (upload.row && upload.row.parentNode) { upload.row.parentNode.removeChild(upload.row); }
+    upload.row = null;
+  }
+
+  // ---- events ------------------------------------------------------------
+
+  // Fires hyrax:uploads:<name> as a CustomEvent and the legacy blueimp
+  // jQuery event name (fileuploadadded, ...) for existing listeners.
+  fire(name, data) {
+    this.element.dispatchEvent(new CustomEvent('hyrax:uploads:' + name, { detail: data, bubbles: true }));
+    if (window.jQuery) { window.jQuery(this.element).trigger('fileupload' + name, data); }
+  }
+}
+
+Uploader.formatFileSize = formatFileSize;
+
+export { Uploader, formatFileSize }
diff --git a/app/assets/javascripts/hyrax/uploader.js b/app/assets/javascripts/hyrax/uploader.js
deleted file mode 100644
index 8cbc5cd565..0000000000
--- a/app/assets/javascripts/hyrax/uploader.js
+++ /dev/null
@@ -1,69 +0,0 @@
-//= require fileupload/tmpl
-//= require fileupload/jquery.iframe-transport
-//= require fileupload/jquery.fileupload.js
-//= require fileupload/jquery.fileupload-process.js
-//= require fileupload/jquery.fileupload-validate.js
-//= require fileupload/jquery.fileupload-ui.js
-//
-/*
- * jQuery File Upload Plugin JS Example
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2010, Sebastian Tschan
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-(function( $ ){
-  'use strict';
-
-  $.fn.extend({
-    hyraxUploader: function( options ) {
-      this.fileupload($.extend({
-        maxChunkSize: 10000000,  // 10 MB chunk size
-        autoUpload: true,
-        url: '/uploads/',
-        type: 'POST',
-        dropZone: $(this).find('.dropzone'),
-        add: function (e, data) {
-          var that = this;
-          $.post('/uploads/', { files: [data.files[0].name] }, function (result) {
-            data.formData = {id: result.files[0].id};
-            $.blueimp.fileupload.prototype.options.add.call(that, e, data);
-          });
-        }
-      }, Hyrax.config.uploader, options))
-      .on('fileuploadadded', function (e, data) {
-        $(e.currentTarget).find('button.cancel').removeAttr("hidden");
-      });
-      $(document).on('dragover', function(e) {
-        var dropZone = $('.dropzone'),
-            timeout = window.dropZoneTimeout;
-        if (!timeout) {
-          dropZone.addClass('in');
-        } else {
-          clearTimeout(timeout);
-        }
-        var found = false,
-            node = e.target;
-        do {
-          if (node === dropZone[0]) {
-            found = true;
-            break;
-          }
-          node = node.parentNode;
-        } while (node !== null);
-        if (found) {
-          dropZone.addClass('hover');
-        } else {
-          dropZone.removeClass('hover');
-        }
-        window.dropZoneTimeout = setTimeout(function () {
-          window.dropZoneTimeout = null;
-          dropZone.removeClass('in hover');
-        }, 100);
-      });
-    }
-  });
-})(jQuery);
diff --git a/app/views/hyrax/base/_form_files.html.erb b/app/views/hyrax/base/_form_files.html.erb
index beb0b5603f..a2ebd3c8e4 100644
--- a/app/views/hyrax/base/_form_files.html.erb
+++ b/app/views/hyrax/base/_form_files.html.erb
@@ -67,4 +67,4 @@
   </div>
 </div>
 
-<%= render 'hyrax/uploads/js_templates' %>
+<%= render 'hyrax/uploads/upload_templates' %>
diff --git a/app/views/hyrax/batch_uploads/_form.html.erb b/app/views/hyrax/batch_uploads/_form.html.erb
index 1604d6d1a3..ba1d293b24 100644
--- a/app/views/hyrax/batch_uploads/_form.html.erb
+++ b/app/views/hyrax/batch_uploads/_form.html.erb
@@ -14,8 +14,4 @@
   <%= f.hidden_field :payload_concern, value: @form.payload_concern %>
 <% end %>
 
-<script type="text/javascript">
-  Blacklight.onLoad(function() {
-    $("#fileupload").fileupload('option', 'downloadTemplateId', 'batch-template-download')
-  });
-</script>
+<%= render 'hyrax/uploads/upload_templates_batch' %>
diff --git a/app/views/hyrax/dashboard/collections/_form_branding.html.erb b/app/views/hyrax/dashboard/collections/_form_branding.html.erb
index 9428329057..856fb8ab9a 100644
--- a/app/views/hyrax/dashboard/collections/_form_branding.html.erb
+++ b/app/views/hyrax/dashboard/collections/_form_branding.html.erb
@@ -4,7 +4,7 @@
   <label><strong><%= t('.banner.label') %></strong></label>
   <p><%= t('.banner.description') %>.</p>
 
-  <div id="fileupload">
+  <div id="fileupload" data-upload-clear="#banner">
     <!-- Redirect browsers with JavaScript disabled to the origin page -->
     <noscript><input type="hidden" name="redirect" value="<%= main_app.root_path %>" /></noscript>
     <!-- The table listing the files available for upload/download -->
@@ -77,7 +77,7 @@
     </div> <!-- end row branding-banner-list -->
   </div> <!-- fileupload -->
 
-  <%= render 'hyrax/uploads/js_templates_branding' %>
+  <%= render 'hyrax/uploads/upload_templates_branding' %>
 
   <label><strong><%= t('.logo.label') %></strong></label>
   <p><%= t('.logo.description') %></p>
diff --git a/app/views/hyrax/file_sets/_versioning.html.erb b/app/views/hyrax/file_sets/_versioning.html.erb
index 9762504142..88469e90f6 100644
--- a/app/views/hyrax/file_sets/_versioning.html.erb
+++ b/app/views/hyrax/file_sets/_versioning.html.erb
@@ -70,6 +70,6 @@
     <% end %>
   <% end %><% end %>
 
-  <%= render 'hyrax/uploads/js_templates_versioning' %>
+  <%= render 'hyrax/uploads/upload_templates_versioning' %>
 
 </div> <!-- /row -->
diff --git a/app/views/hyrax/uploads/_js_templates.html.erb b/app/views/hyrax/uploads/_js_templates.html.erb
deleted file mode 100644
index 57558d1e3d..0000000000
--- a/app/views/hyrax/uploads/_js_templates.html.erb
+++ /dev/null
@@ -1,133 +0,0 @@
-<!-- The template to display files available for upload -->
-<% fade_class_if_not_test = Rails.env.test? ? '' : 'fade' %>
-<script id="template-upload" type="text/x-tmpl">
-{% for (var i=0, file; file=o.files[i]; i++) { %}
-    <tr class="template-upload <%= fade_class_if_not_test %>">
-        <td>
-            <span class="preview"></span>
-        </td>
-        <td>
-            <p class="name">{%=file.name%}</p>
-            <strong class="error text-danger"></strong>
-        </td>
-        <td>
-            <p class="size">Processing...</p>
-            <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div></div>
-        </td>
-        <td class="text-right">
-            {% if (!i && !o.options.autoUpload) { %}
-                <button class="btn btn-primary start" disabled>
-                    <span class="fa fa-upload"></span>
-                    <span><%= t('.start') %></span>
-                </button>
-            {% } %}
-            {% if (!i) { %}
-                <button class="btn btn-sm btn-warning cancel">
-                    <span class="fa fa-ban"></span>
-                    <span><%= t('helpers.action.cancel') %></span>
-                </button>
-            {% } %}
-        </td>
-    </tr>
-{% } %}
-</script>
-
-<!-- function used by the following template -->
-<script type="text/javascript">
-  function setAllResourceTypes(resourceTypeId) {
-    var firstResourceType = $("#resource_type_" + resourceTypeId.toString())[0];
-    var selected_options = [];
-    for (var i = 0; i < firstResourceType.length; i++) {
-      if (firstResourceType.options[i].selected) {
-        selected_options.push(firstResourceType.options[i].value);
-      }
-    }
-    $(".resource_type_dropdown").each(function(index, element) {
-      for(var i=0; i< this.length; i++) {
-        this.options[i].selected =
-          $.inArray(this.options[i].value, selected_options) > -1 ? true : false;
-      }
-    });
-  }
-</script>
-
-<!-- The template to display files available for download -->
-<script id="batch-template-download" type="text/x-tmpl">
-{% for (var i=0, file; file=o.files[i]; i++) { %}
-    <tr class="template-download add-batch-work-file-wrapper <%= fade_class_if_not_test %>">
-        <td>
-          <div class="row padding-bottom">
-            <div class="col-sm-6 name">
-                <span>{%=file.name%}</span>
-                <input type="hidden" name="uploaded_files[]" value="{%=file.id%}">
-            </div>
-            <div class="col-sm-6">
-              {% if (file.error) { %}
-                  <div><span class="badge badge-danger">Error</span> {%=file.error%}</div>
-              {% } %}
-              <span class="size">{%=o.formatFileSize(file.size)%}</span>
-              <button class="btn btn-sm btn-danger delete float-right" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                  <span class="fa fa-trash"></span>
-                  <span><%= t('helpers.action.delete') %></span>
-              </button>
-            </div>
-          </div>
-          <div class="row">
-            <div class="col-sm-12">
-              <div class="form-group row">
-                <label for="title_{%=file.id%}" class="col-sm-5 col-form-label"><%= t('.display_label') %></label>
-                <div class="col-sm-7 padding-bottom">
-                  <input type="text" class="form-control" name="title[{%=file.id%}]" id="title_{%=file.id%}" value="{%=file.name%}">
-                </div>
-                <label for="resource_type_{%=file.id%}" class="col-sm-5 col-form-label">Resource Type</label>
-                <div class="col-sm-7 padding-bottom">
-                  <select class="form-control resource_type_dropdown" multiple="multiple" size="6" name="resource_type[{%=file.id%}][]" id="resource_type_{%=file.id%}" value="{%=file.name%}">
-                    <%= options_for_select(Hyrax::ResourceTypesService.select_options) %>
-                  </select>
-                  <button class="btn btn-secondary float-right resource_type_button" onClick="setAllResourceTypes({%= file.id %}); return false;"><%= t('.set_all_to_this_resource_type') %></button>
-                </div>
-              </div>
-            </div>
-          </div>
-        </td>
-    </tr>
-{% } %}
-</script>
-
-<!-- Simpler display of files available for download. Originally from hyrax/base/_form_files -->
-<!-- TODO: further consolidate with template-download above -->
-<script id="template-download" type="text/x-tmpl">
-{% for (var i=0, file; file=o.files[i]; i++) { %}
-    <tr class="template-download <%= fade_class_if_not_test %>">
-        <td>
-            <span class="preview">
-                {% if (file.thumbnailUrl) { %}
-                    <a href="{%=file.url%}" title="{%=file.name%}" download="{%=file.name%}" data-gallery><img src="{%=file.thumbnailUrl%}"></a>
-                {% } %}
-            </span>
-        </td>
-        <td>
-            <p class="name">
-                {% if (file.url) { %}
-                    <a href="{%=file.url%}" title="{%=file.name%}" download="{%=file.name%}" {%=file.thumbnailUrl?'data-gallery':''%}>{%=file.name%}</a>
-                {% } else { %}
-                    <span>{%=file.name%}</span>
-                {% } %}
-                <input type="hidden" name="uploaded_files[]" value="{%=file.id%}">
-            </p>
-            {% if (file.error) { %}
-                <div><span class="badge badge-danger"><%= t('.error') %></span> {%=file.error%}</div>
-            {% } %}
-        </td>
-        <td>
-            <span class="size">{%=o.formatFileSize(file.size)%}</span>
-        </td>
-        <td class="text-right">
-            <button class="btn btn-sm btn-danger delete" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                <span class="fa fa-trash"></span>
-                <%= t('helpers.action.delete') %>
-            </button>
-        </td>
-    </tr>
-{% } %}
-</script>
diff --git a/app/views/hyrax/uploads/_js_templates_branding.html.erb b/app/views/hyrax/uploads/_js_templates_branding.html.erb
deleted file mode 100644
index 858f2221bb..0000000000
--- a/app/views/hyrax/uploads/_js_templates_branding.html.erb
+++ /dev/null
@@ -1,120 +0,0 @@
-<!-- The template to display files available for upload -->
-<script id="template-upload" type="text/x-tmpl">
-{% for (var i=0, file; file=o.files[i]; i++) { %}
-    <tr class="template-upload fade">
-      <td>
-        <span class="preview"></span>
-      </td>
-      <td>
-        <p class="name">{%=file.name%}</p>
-        <strong class="error text-danger"></strong>
-      </td>
-    </tr>
-{% } %}
-</script>
-
-<!-- function used by the following template -->
-<script type="text/javascript">
-  function setAllResourceTypes(resourceTypeId) {
-    var firstResourceType = $("#resource_type_" + resourceTypeId.toString())[0];
-    var selected_options = [];
-    for (var i = 0; i < firstResourceType.length; i++) {
-      if (firstResourceType.options[i].selected) {
-        selected_options.push(firstResourceType.options[i].value);
-      }
-    }
-    $(".resource_type_dropdown").each(function(index, element) {
-      for(var i=0; i< this.length; i++) {
-        this.options[i].selected =
-            $.inArray(this.options[i].value, selected_options) > -1 ? true : false;
-      }
-    });
-  }
-</script>
-
-<!-- Simpler display of files available for download. Originally from hyrax/base/_form_files -->
-<!-- TODO: further consolidate with template-download above -->
-<!-- The template to display the banner once upload is complete -->
-<script id="template-download" type="text/x-tmpl">
-{% for (var i=0, file; file=o.files[i]; i++) { %}
-        <span class="template-download fade">
-          <div id="banner">
-            <div class="row branding-banner-row">
-              <div class="col-sm-3">
-                <span class="name">
-                  <span>{%=file.name%}</span>
-                  <input type="hidden" name="banner_files[]" value="{%=file.id%}">
-                </span>
-                {% if (file.error) { %}
-                  <span><span class="badge badge-danger"><%= t('.error') %></span> {%=file.error%}</span>
-                {% } %}
-              </div>
-
-              <div class="col-sm-2">
-                <button class="btn btn-link remove branding-banner-remove" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}" onclick=$("#banner").remove(); {% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                  <span class="fa fa-times"></span>
-                  <span class="controls-remove-text"><%= t('.remove') %></span>
-                  <span class="sr-only">
-                    <%= t('.previous') %>
-                    <span class="controls-field-name-text"><%= t('.remove_new_banner') %></span>
-                  </span>
-                </button>
-              </div> <!-- end col-sm-2 -->
-            </div> <!-- row branding-banner-row -->
-          </div> <!-- end container banner -->
-        </span>
-{% }  $("div#banner").remove(); %}
-</script>
-
-<!-- The template to display logo in the table once upload is complete -->
-<script id="logo-template-download" type="text/x-tmpl">
-{% for (var i=0, file; file=o.files[i]; i++) { %}
-            <span class="template-download fade">
-            <div class="row branding-logo-row">
-              <div class="col-sm-3">
-                <span class="preview">
-                    {% if (file.thumbnailUrl) { %}
-                        <a href="{%=file.url%}" title="{%=file.name%}" download="{%=file.name%}" data-gallery><img src="{%=file.thumbnailUrl%}"></a>
-                    {% } %}
-                </span>
-
-                <span class="name">
-                    {% if (file.url) { %}
-                        <a href="{%=file.url%}" title="{%=file.name%}" download="{%=file.name%}" {%=file.thumbnailUrl?'data-gallery':''%}>{%=file.name%}</a>
-                    {% } else { %}
-                        <span>{%=file.name%}</span>
-                    {% } %}
-                    <input type="hidden" name="logo_files[]" value="{%=file.id%}">
-                </span>
-
-                {% if (file.error) { %}
-                    <span><span class="badge badge-danger">Error</span> {%=file.error%}</span>
-                {% } %}
-              </div>
-
-              <div class="col-sm-4 branding-logo-input">
-                <label for="linkurl"><%= t('.link_url') %>
-                  <input id="linkurl" class="branding-logo-input" type="text" name="linkurl[]"></input>
-                </label>
-                <label for="alttext"><%= t('.alt_text') %>
-                  <input id="alttext" class="branding-logo-input" type="text" name="alttext[]"></input>
-                </label>
-              </div>
-
-              <div class="col-sm-2 text-right">
-                <span class="input-group-btn field-controls">
-            <button class="btn btn-sm btn-danger delete branding-logo-remove" data-type="{%=file.deleteType%}" data-url="{%=file.deleteUrl%}"{% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                    <span class="fa fa-times"></span>
-                    <span class="controls-remove-text">Remove</span>
-                    <span class="sr-only">
-                      <%= t('.previous') %>
-                      <span class="controls-field-name-text"><%= t('.remove_new_logo') %></span>
-                    </span>
-                  </button>
-                </span>
-              </div>
-
-            </div>
-            </span>
-{% } %}
-</script>
diff --git a/app/views/hyrax/uploads/_js_templates_versioning.html.erb b/app/views/hyrax/uploads/_js_templates_versioning.html.erb
deleted file mode 100644
index 5eff2f2afd..0000000000
--- a/app/views/hyrax/uploads/_js_templates_versioning.html.erb
+++ /dev/null
@@ -1,172 +0,0 @@
-<!-- The template to display files available for upload -->
-<% fade_class_if_not_test = Rails.env.test? ? '' : 'fade' %>
-<script id="versioning-template-upload" type="text/x-tmpl">
-{% for (var i=0, file; file=o.files[i]; i++) { %}
-    <tr class="template-upload <%= fade_class_if_not_test %>">
-        <td>
-            <span class="preview"></span>
-        </td>
-        <td>
-            <p class="name">{%=file.name%}</p>
-            <strong class="error text-danger"></strong>
-        </td>
-        <td>
-            <p class="size">Processing...</p>
-            <div class="progress"
-                 role="progressbar"
-                 aria-valuemin="0"
-                 aria-valuemax="100"
-                 aria-valuenow="0">
-               <div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div>
-             </div>
-        </td>
-        <td class="text-right">
-            {% if (!i && !o.options.autoUpload) { %}
-                <button class="btn btn-primary start" disabled>
-                    <span class="fa fa-upload"></span>
-                    <span><%= t('.start') %></span>
-                </button>
-            {% } %}
-            {% if (!i) { %}
-                <button class="btn btn-sm btn-warning cancel">
-                    <span class="fa fa-ban"></span>
-                    <span><%= t('helpers.action.cancel') %></span>
-                </button>
-            {% } %}
-        </td>
-    </tr>
-{% } %}
-</script>
-
-<!-- function used by the following template -->
-<script type="text/javascript">
-  function setAllResourceTypesVersioning(resourceTypeId) {
-    var firstResourceType = $("#resource_type_" + resourceTypeId.toString())[0];
-    var selected_options = [];
-    for (var i = 0; i < firstResourceType.length; i++) {
-      if (firstResourceType.options[i].selected) {
-        selected_options.push(firstResourceType.options[i].value);
-      }
-    }
-    $(".resource_type_dropdown").each(function(index, element) {
-      for(var i=0; i< this.length; i++) {
-        this.options[i].selected =
-            $.inArray(this.options[i].value, selected_options) > -1 ? true : false;
-      }
-    });
-  }
-</script>
-
-<!-- The template to display files available for download -->
-<script id="versioning-batch-template-download" type="text/x-tmpl">
-{% for (var i=0, file; file=o.files[i]; i++) { %}
-    <tr class="template-download add-batch-work-file-wrapper <%= fade_class_if_not_test %>">
-        <td>
-          <div class="row padding-bottom">
-            <div class="col-sm-6 name">
-                <span>{%=file.name%}</span>
-                <input type="hidden" name="uploaded_files[]" value="{%=file.id%}">
-            </div>
-            <div class="col-sm-6">
-              {% if (file.error) { %}
-                  <div><span class="badge badge-danger">Error</span> {%=file.error%}</div>
-              {% } %}
-              <span class="size">{%=o.formatFileSize(file.size)%}</span>
-              <button class="btn btn-sm btn-danger delete float-right"
-                      data-type="{%=file.deleteType%}"
-                      data-url="{%=file.deleteUrl%}"
-                      {% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                  <span class="fa fa-trash"></span>
-                  <span><%= t('helpers.action.delete') %></span>
-              </button>
-            </div>
-          </div>
-          <div class="row">
-            <div class="col-sm-12">
-              <div class="form-group row">
-                <label for="title_{%=file.id%}" class="col-sm-5 col-form-label"><%= t('.display_label') %></label>
-                <div class="col-sm-7 padding-bottom">
-                  <input type="text" class="form-control" name="title[{%=file.id%}]" id="title_{%=file.id%}" value="{%=file.name%}">
-                </div>
-                <label for="resource_type_{%=file.id%}" class="col-sm-5 col-form-label">Resource Type</label>
-                <div class="col-sm-7 padding-bottom">
-                  <select class="form-control resource_type_dropdown"
-                          multiple="multiple"
-                          size="6"
-                          name="resource_type[{%=file.id%}][]"
-                           id="resource_type_{%=file.id%}"
-                           value="{%=file.name%}">
-                    <%= options_for_select(Hyrax::ResourceTypesService.select_options) %>
-                  </select>
-                  <button class="btn btn-secondary float-right resource_type_button"
-                          onClick="setAllResourceTypesVersioning({%= file.id %}); return false;">
-                          <%= t('.set_all_to_this_resource_type') %>
-                  </button>
-                </div>
-              </div>
-            </div>
-          </div>
-        </td>
-    </tr>
-{% } %}
-</script>
-
-<!-- Simpler display of files available for download. Originally from hyrax/base/_form_files -->
-<!-- TODO: further consolidate with template-download above -->
-<!-- The template to display the files once upload is complete -->
-<script id="versioning-template-download" type="text/x-tmpl">
-{% for (var i=0, file; file=o.files[i]; i++) { %}
-        <span class="template-download fade">
-          <div id="files">
-            <div class="row versioning-files-row">
-              <div class="col-sm-3">
-                <span class="name">
-                  <span>{%=file.name%}</span>
-                  <input type="hidden" name="files_files[]" value="{%=file.id%}">
-                </span>
-                {% if (file.error) { %}
-                  <span><span class="badge badge-danger"><%= t('.error') %></span> {%=file.error%}</span>
-                {% } %}
-              </div>
-
-              <div class="col-sm-2">
-                <button class="btn btn-link remove versioning-files-remove"
-                        data-type="{%=file.deleteType%}"
-                        data-url="{%=file.deleteUrl%}"
-                        onclick=$("#files").remove(); {% if (file.deleteWithCredentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
-                  <span class="fa fa-times"></span>
-                  <span class="controls-remove-text"><%= t('.remove') %></span>
-                  <span class="sr-only">
-                    <%= t('.previous') %>
-                    <span class="controls-field-name-text"><%= t('.remove_new_version') %></span>
-                  </span>
-                </button>
-              </div> <!-- end col-sm-2 -->
-            </div> <!-- row versioning-files-row -->
-          </div> <!-- end container files -->
-        </span>
-{% }  $("div#files").remove(); %}
-</script>
-
-<script>
-    $(function () {
-        // will run after DOM is loaded
-        $('#fileuploadVersioning').hyraxUploader({downloadTemplateId: 'versioning-template-download',
-            uploadTemplateId: 'versioning-template-upload',
-            // The regular expression for allowed file types, matches
-            // against either file type or file name:
-            //acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
-            // The maximum allowed file size in bytes:
-            maxFileSize: <%= Hyrax.config.uploader[:maxFileSize] %>,
-            // The minimum allowed file size in bytes:
-            //minFileSize: undefined, // No minimal file size
-            // The limit of files to be uploaded:
-            //maxNumberOfFiles: 100,
-            messages: {
-                acceptFileTypes: '<%= t(".options.messages.accept_file_types") %>',
-                maxFileSize: '<%= t(".options.messages.max_file_size") %>',
-                maxNumberOfFiles: '<%= t(".options.messages.max_number_of_files") %>',
-                minFileSize: '<%= t(".options.messages.min_file_size") %>',
-            }});
-    });
-</script>
diff --git a/app/views/hyrax/uploads/_upload_templates.html.erb b/app/views/hyrax/uploads/_upload_templates.html.erb
new file mode 100644
index 0000000000..6af27d44f2
--- /dev/null
+++ b/app/views/hyrax/uploads/_upload_templates.html.erb
@@ -0,0 +1,31 @@
+<%# Row template cloned by Hyrax.Uploader for each file on the work form.
+    The hidden input is authored without a name; the uploader assigns
+    data-upload-field-name and the record id when the upload completes. %>
+<template id="hyrax-upload-row">
+  <tr class="template-download">
+    <td>
+      <span class="preview"></span>
+    </td>
+    <td>
+      <p class="name" data-upload-name></p>
+      <strong class="error text-danger" data-upload-error></strong>
+      <input type="hidden" data-upload-id-input data-upload-field-name="uploaded_files[]" value="">
+      <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100">
+        <div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;" data-upload-progress></div>
+      </div>
+    </td>
+    <td>
+      <span class="size" data-upload-size></span>
+    </td>
+    <td class="text-right">
+      <button type="button" class="btn btn-sm btn-warning cancel" data-upload-cancel>
+        <span class="fa fa-ban"></span>
+        <span><%= t('helpers.action.cancel') %></span>
+      </button>
+      <button type="button" class="btn btn-sm btn-danger delete" data-upload-delete hidden>
+        <span class="fa fa-trash"></span>
+        <span><%= t('helpers.action.delete') %></span>
+      </button>
+    </td>
+  </tr>
+</template>
diff --git a/app/views/hyrax/uploads/_upload_templates_batch.html.erb b/app/views/hyrax/uploads/_upload_templates_batch.html.erb
new file mode 100644
index 0000000000..37e4a359ad
--- /dev/null
+++ b/app/views/hyrax/uploads/_upload_templates_batch.html.erb
@@ -0,0 +1,74 @@
+<%# Row template for batch upload: per-file title and resource type inputs.
+    Attribute values containing {{id}} are rewritten with the staged upload's
+    id when the upload completes. %>
+<template id="hyrax-upload-row-batch">
+  <tr class="template-download add-batch-work-file-wrapper">
+    <td>
+      <div class="row padding-bottom">
+        <div class="col-sm-6 name">
+          <span data-upload-name></span>
+          <input type="hidden" data-upload-id-input data-upload-field-name="uploaded_files[]" value="">
+        </div>
+        <div class="col-sm-6">
+          <div><strong class="error text-danger" data-upload-error></strong></div>
+          <span class="size" data-upload-size></span>
+          <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100">
+            <div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;" data-upload-progress></div>
+          </div>
+          <button type="button" class="btn btn-sm btn-warning cancel float-right" data-upload-cancel>
+            <span class="fa fa-ban"></span>
+            <span><%= t('helpers.action.cancel') %></span>
+          </button>
+          <button type="button" class="btn btn-sm btn-danger delete float-right" data-upload-delete hidden>
+            <span class="fa fa-trash"></span>
+            <span><%= t('helpers.action.delete') %></span>
+          </button>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-sm-12">
+          <div class="form-group row">
+            <label for="title_{{id}}" class="col-sm-5 col-form-label"><%= t('hyrax.uploads.js_templates.display_label') %></label>
+            <div class="col-sm-7 padding-bottom">
+              <input type="text" class="form-control batch-title-input" name="title[{{id}}]" id="title_{{id}}" data-upload-name-value>
+            </div>
+            <label for="resource_type_{{id}}" class="col-sm-5 col-form-label">Resource Type</label>
+            <div class="col-sm-7 padding-bottom">
+              <select class="form-control resource_type_dropdown" multiple="multiple" size="6" name="resource_type[{{id}}][]" id="resource_type_{{id}}">
+                <%= options_for_select(Hyrax::ResourceTypesService.select_options) %>
+              </select>
+              <button type="button" class="btn btn-secondary float-right resource_type_button" data-file-id="{{id}}">
+                <%= t('hyrax.uploads.js_templates.set_all_to_this_resource_type') %>
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </td>
+  </tr>
+</template>
+
+<script type="text/javascript">
+  // Copy one row's resource type selection to every row.
+  document.addEventListener('click', function(event) {
+    var button = event.target.closest ? event.target.closest('.resource_type_button') : null;
+    if (!button) { return; }
+    event.preventDefault();
+    var source = document.getElementById('resource_type_' + button.getAttribute('data-file-id'));
+    if (!source) { return; }
+    var selected = Array.prototype.filter.call(source.options, function(option) { return option.selected; })
+                        .map(function(option) { return option.value; });
+    document.querySelectorAll('.resource_type_dropdown').forEach(function(dropdown) {
+      Array.prototype.forEach.call(dropdown.options, function(option) {
+        option.selected = selected.indexOf(option.value) !== -1;
+      });
+    });
+  });
+
+  // The batch form uses the shared #fileupload widget with its own row
+  // template; the uploader initializes in hyrax/fileupload.js first.
+  Blacklight.onLoad(function() {
+    var widget = document.getElementById('fileupload');
+    if (widget && widget.hyraxUploader) { widget.hyraxUploader.setRowTemplate('hyrax-upload-row-batch'); }
+  });
+</script>
diff --git a/app/views/hyrax/uploads/_upload_templates_branding.html.erb b/app/views/hyrax/uploads/_upload_templates_branding.html.erb
new file mode 100644
index 0000000000..1fe5de32cc
--- /dev/null
+++ b/app/views/hyrax/uploads/_upload_templates_branding.html.erb
@@ -0,0 +1,90 @@
+<%# Row templates for collection branding.
+
+    The banner widget (#fileupload) holds a single file submitted as
+    banner_files[]; uploading clears the currently-attached banner markup
+    (and its banner_unchanged input) via data-upload-clear="#banner".
+    The logo widget (#fileuploadlogo) appends rows submitted as
+    logo_files[] with per-logo linkurl[]/alttext[] inputs. %>
+<template id="hyrax-upload-row">
+  <span class="template-download">
+    <div class="row branding-banner-row">
+      <div class="col-sm-4">
+        <span class="name">
+          <span data-upload-name></span>
+          <input type="hidden" data-upload-id-input data-upload-field-name="banner_files[]" value="">
+        </span>
+        <span><strong class="error text-danger" data-upload-error></strong></span>
+      </div>
+
+      <div class="col-sm-4">
+        <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100">
+          <div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;" data-upload-progress></div>
+        </div>
+      </div>
+
+      <div class="col-sm-2">
+        <button type="button" class="btn btn-link remove branding-banner-remove" data-upload-cancel>
+          <span class="fa fa-times"></span>
+          <span class="controls-remove-text"><%= t('hyrax.uploads.js_templates_branding.remove') %></span>
+          <span class="sr-only">
+            <%= t('hyrax.uploads.js_templates_branding.previous') %>
+            <span class="controls-field-name-text"><%= t('hyrax.uploads.js_templates_branding.remove_new_banner') %></span>
+          </span>
+        </button>
+        <button type="button" class="btn btn-link remove branding-banner-remove" data-upload-delete hidden>
+          <span class="fa fa-times"></span>
+          <span class="controls-remove-text"><%= t('hyrax.uploads.js_templates_branding.remove') %></span>
+          <span class="sr-only">
+            <%= t('hyrax.uploads.js_templates_branding.previous') %>
+            <span class="controls-field-name-text"><%= t('hyrax.uploads.js_templates_branding.remove_new_banner') %></span>
+          </span>
+        </button>
+      </div>
+    </div>
+  </span>
+</template>
+
+<template id="hyrax-upload-row-logo">
+  <span class="template-download">
+    <div class="row branding-logo-row">
+      <div class="col-sm-3">
+        <span class="name">
+          <span data-upload-name></span>
+          <input type="hidden" data-upload-id-input data-upload-field-name="logo_files[]" value="">
+        </span>
+        <span><strong class="error text-danger" data-upload-error></strong></span>
+        <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100">
+          <div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;" data-upload-progress></div>
+        </div>
+      </div>
+
+      <div class="col-sm-4 branding-logo-input">
+        <label><%= t('hyrax.uploads.js_templates_branding.link_url') %>
+          <input class="branding-logo-input" type="text" data-upload-field-name="linkurl[]" value="">
+        </label>
+        <label><%= t('hyrax.uploads.js_templates_branding.alt_text') %>
+          <input class="branding-logo-input" type="text" data-upload-field-name="alttext[]" value="">
+        </label>
+      </div>
+
+      <div class="col-sm-2">
+        <button type="button" class="btn btn-link remove branding-logo-remove" data-upload-cancel>
+          <span class="fa fa-times"></span>
+          <span class="controls-remove-text"><%= t('hyrax.uploads.js_templates_branding.remove') %></span>
+          <span class="sr-only">
+            <%= t('hyrax.uploads.js_templates_branding.previous') %>
+            <span class="controls-field-name-text"><%= t('hyrax.uploads.js_templates_branding.remove_new_logo') %></span>
+          </span>
+        </button>
+        <button type="button" class="btn btn-link remove branding-logo-remove" data-upload-delete hidden>
+          <span class="fa fa-times"></span>
+          <span class="controls-remove-text"><%= t('hyrax.uploads.js_templates_branding.remove') %></span>
+          <span class="sr-only">
+            <%= t('hyrax.uploads.js_templates_branding.previous') %>
+            <span class="controls-field-name-text"><%= t('hyrax.uploads.js_templates_branding.remove_new_logo') %></span>
+          </span>
+        </button>
+      </div>
+    </div>
+  </span>
+</template>
diff --git a/app/views/hyrax/uploads/_upload_templates_versioning.html.erb b/app/views/hyrax/uploads/_upload_templates_versioning.html.erb
new file mode 100644
index 0000000000..5f804e10cb
--- /dev/null
+++ b/app/views/hyrax/uploads/_upload_templates_versioning.html.erb
@@ -0,0 +1,58 @@
+<%# Row template for the file set Versions tab: a single staged file whose
+    id is submitted as files_files[] with the update_versioning form. %>
+<template id="hyrax-upload-row-versioning">
+  <span class="template-download">
+    <div class="row versioning-files-row">
+      <div class="col-sm-6">
+        <span class="name">
+          <span data-upload-name></span>
+          <input type="hidden" data-upload-id-input data-upload-field-name="files_files[]" value="">
+        </span>
+        <span><strong class="error text-danger" data-upload-error></strong></span>
+      </div>
+
+      <div class="col-sm-4">
+        <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100">
+          <div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;" data-upload-progress></div>
+        </div>
+      </div>
+
+      <div class="col-sm-2">
+        <button type="button" class="btn btn-link remove versioning-files-remove" data-upload-cancel>
+          <span class="fa fa-times"></span>
+          <span class="controls-remove-text"><%= t('hyrax.uploads.js_templates_versioning.remove') %></span>
+          <span class="sr-only">
+            <%= t('hyrax.uploads.js_templates_versioning.previous') %>
+            <span class="controls-field-name-text"><%= t('hyrax.uploads.js_templates_versioning.remove_new_version') %></span>
+          </span>
+        </button>
+        <button type="button" class="btn btn-link remove versioning-files-remove" data-upload-delete hidden>
+          <span class="fa fa-times"></span>
+          <span class="controls-remove-text"><%= t('hyrax.uploads.js_templates_versioning.remove') %></span>
+          <span class="sr-only">
+            <%= t('hyrax.uploads.js_templates_versioning.previous') %>
+            <span class="controls-field-name-text"><%= t('hyrax.uploads.js_templates_versioning.remove_new_version') %></span>
+          </span>
+        </button>
+      </div>
+    </div>
+  </span>
+</template>
+
+<script type="text/javascript">
+  Blacklight.onLoad(function() {
+    var widget = document.getElementById('fileuploadVersioning');
+    if (widget && !widget.hyraxUploader) {
+      new Hyrax.Uploader(widget, {
+        rowTemplate: 'hyrax-upload-row-versioning',
+        maxFileSize: <%= Hyrax.config.uploader[:maxFileSize] %>,
+        messages: {
+          acceptFileTypes: '<%= t("hyrax.uploads.js_templates_versioning.options.messages.accept_file_types") %>',
+          maxFileSize: '<%= t("hyrax.uploads.js_templates_versioning.options.messages.max_file_size") %>',
+          maxNumberOfFiles: '<%= t("hyrax.uploads.js_templates_versioning.options.messages.max_number_of_files") %>',
+          minFileSize: '<%= t("hyrax.uploads.js_templates_versioning.options.messages.min_file_size") %>'
+        }
+      });
+    }
+  });
+</script>
diff --git a/spec/javascripts/hyrax_uploader_spec.js b/spec/javascripts/hyrax_uploader_spec.js
new file mode 100644
index 0000000000..f1ba265bd5
--- /dev/null
+++ b/spec/javascripts/hyrax_uploader_spec.js
@@ -0,0 +1,135 @@
+describe("Hyrax.Uploader", function() {
+  var Uploader = require('hyrax/uploader').Uploader;
+  var sentRequests;
+  var RealXMLHttpRequest = window.XMLHttpRequest;
+
+  // A minimal XHR stand-in capturing Hyrax.Uploader's content uploads and
+  // succeeding immediately.
+  function MockXhr() {
+    var self = this;
+    this.upload = { addEventListener: function() {} };
+    this.headers = {};
+    this.status = 200;
+    this.responseText = '{}';
+    this.listeners = {};
+    this.open = function(method, url) { self.method = method; self.url = url; };
+    this.setRequestHeader = function(name, value) { self.headers[name] = value; };
+    this.addEventListener = function(name, handler) { self.listeners[name] = handler; };
+    this.abort = function() { if (self.listeners.abort) { self.listeners.abort(); } };
+    this.send = function(body) {
+      self.body = body;
+      sentRequests.push(self);
+      setTimeout(function() { self.listeners.load(); }, 0);
+    };
+  }
+
+  function stubCreateResponse(id) {
+    return Promise.resolve({
+      ok: true,
+      json: function() {
+        return Promise.resolve({ files: [{ id: id, name: 'test.txt', deleteUrl: '/uploads/' + id }] });
+      }
+    });
+  }
+
+  function widgetFixture() {
+    setFixtures(
+      '<div id="hyrax-uploader-fixture">' +
+      '  <table><tbody class="files"></tbody></table>' +
+      '</div>'
+    );
+    // <template> content is inert; jasmine-jquery fixtures tolerate it
+    var template = document.createElement('template');
+    template.id = 'hyrax-upload-row';
+    template.innerHTML =
+      '<tr class="template-download">' +
+      '  <td><p class="name" data-upload-name></p>' +
+      '      <strong class="error" data-upload-error></strong>' +
+      '      <input type="hidden" data-upload-id-input data-upload-field-name="uploaded_files[]" value="">' +
+      '      <div class="progress"><div class="progress-bar" data-upload-progress></div></div></td>' +
+      '  <td><span class="size" data-upload-size></span></td>' +
+      '  <td><button type="button" data-upload-cancel></button>' +
+      '      <button type="button" data-upload-delete hidden></button></td>' +
+      '</tr>';
+    document.getElementById('hyrax-uploader-fixture').appendChild(template);
+    return document.getElementById('hyrax-uploader-fixture');
+  }
+
+  beforeEach(function() {
+    sentRequests = [];
+    window.XMLHttpRequest = MockXhr;
+  });
+
+  afterEach(function() {
+    window.XMLHttpRequest = RealXMLHttpRequest;
+  });
+
+  it("registers the filename, uploads the bytes, and fills the row", function(done) {
+    spyOn(window, 'fetch').and.callFake(function() { return stubCreateResponse(42); });
+    var element = widgetFixture();
+    var uploader = new Uploader(element, { maxChunkSize: 1000000 });
+
+    element.addEventListener('hyrax:uploads:completed', function() {
+      // pre-create posted the filename
+      expect(window.fetch).toHaveBeenCalled();
+
+      // one unchunked content upload carrying the record id
+      expect(sentRequests.length).toEqual(1);
+      expect(sentRequests[0].headers['Content-Range']).toBeUndefined();
+      expect(sentRequests[0].body.get('id')).toEqual('42');
+
+      // the row's hidden input now carries the staged file id
+      var input = element.querySelector('input[name="uploaded_files[]"]');
+      expect(input.value).toEqual('42');
+      done();
+    });
+
+    uploader.addFiles([new File(['hello world'], 'test.txt')]);
+  });
+
+  it("splits large files into sequential Content-Range chunks", function(done) {
+    spyOn(window, 'fetch').and.callFake(function() { return stubCreateResponse(7); });
+    var element = widgetFixture();
+    var uploader = new Uploader(element, { maxChunkSize: 10 });
+
+    element.addEventListener('hyrax:uploads:completed', function() {
+      expect(sentRequests.length).toEqual(3);
+      expect(sentRequests[0].headers['Content-Range']).toEqual('bytes 0-9/25');
+      expect(sentRequests[1].headers['Content-Range']).toEqual('bytes 10-19/25');
+      expect(sentRequests[2].headers['Content-Range']).toEqual('bytes 20-24/25');
+      done();
+    });
+
+    uploader.addFiles([new File(['1234567890123456789012345'], 'chunky.bin')]);
+  });
+
+  it("fires the legacy jQuery event names for the save work gate", function(done) {
+    spyOn(window, 'fetch').and.callFake(function() { return stubCreateResponse(9); });
+    var element = widgetFixture();
+    var events = [];
+    ['fileuploadstart', 'fileuploadadded', 'fileuploadcompleted', 'fileuploadstop'].forEach(function(name) {
+      $(element).on(name, function() { events.push(name); });
+    });
+    var uploader = new Uploader(element, { maxChunkSize: 1000000 });
+
+    $(element).on('fileuploadstop', function() {
+      expect(events).toEqual(['fileuploadadded', 'fileuploadstart', 'fileuploadcompleted', 'fileuploadstop']);
+      done();
+    });
+
+    uploader.addFiles([new File(['hello'], 'events.txt')]);
+  });
+
+  it("rejects files over maxFileSize with an error row and no requests", function() {
+    spyOn(window, 'fetch');
+    var element = widgetFixture();
+    var uploader = new Uploader(element, { maxFileSize: 3 });
+
+    uploader.addFiles([new File(['way too big'], 'big.txt')]);
+
+    expect(window.fetch).not.toHaveBeenCalled();
+    expect(element.querySelector('[data-upload-error]').textContent).not.toEqual('');
+    var input = element.querySelector('input[name="uploaded_files[]"]');
+    expect(input).toBeNull();
+  });
+});
diff --git a/vendor/assets/javascripts/fileupload/jquery.fileupload-process.js b/vendor/assets/javascripts/fileupload/jquery.fileupload-process.js
deleted file mode 100644
index ce914dfe77..0000000000
--- a/vendor/assets/javascripts/fileupload/jquery.fileupload-process.js
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * jQuery File Upload Processing Plugin
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2012, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/* jshint nomen:false */
-/* global define, require, window */
-
-(function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define([
-            'jquery',
-            './jquery.fileupload'
-        ], factory);
-    } else if (typeof exports === 'object') {
-        // Node/CommonJS:
-        factory(require('jquery'));
-    } else {
-        // Browser globals:
-        factory(
-            window.jQuery
-        );
-    }
-}(function ($) {
-    'use strict';
-
-    var originalAdd = $.blueimp.fileupload.prototype.options.add;
-
-    // The File Upload Processing plugin extends the fileupload widget
-    // with file processing functionality:
-    $.widget('blueimp.fileupload', $.blueimp.fileupload, {
-
-        options: {
-            // The list of processing actions:
-            processQueue: [
-                /*
-                {
-                    action: 'log',
-                    type: 'debug'
-                }
-                */
-            ],
-            add: function (e, data) {
-                var $this = $(this);
-                data.process(function () {
-                    return $this.fileupload('process', data);
-                });
-                originalAdd.call(this, e, data);
-            }
-        },
-
-        processActions: {
-            /*
-            log: function (data, options) {
-                console[options.type](
-                    'Processing "' + data.files[data.index].name + '"'
-                );
-            }
-            */
-        },
-
-        _processFile: function (data, originalData) {
-            var that = this,
-                dfd = $.Deferred().resolveWith(that, [data]),
-                chain = dfd.promise();
-            this._trigger('process', null, data);
-            $.each(data.processQueue, function (i, settings) {
-                var func = function (data) {
-                    if (originalData.errorThrown) {
-                        return $.Deferred()
-                                .rejectWith(that, [originalData]).promise();
-                    }
-                    return that.processActions[settings.action].call(
-                        that,
-                        data,
-                        settings
-                    );
-                };
-                chain = chain.pipe(func, settings.always && func);
-            });
-            chain
-                .done(function () {
-                    that._trigger('processdone', null, data);
-                    that._trigger('processalways', null, data);
-                })
-                .fail(function () {
-                    that._trigger('processfail', null, data);
-                    that._trigger('processalways', null, data);
-                });
-            return chain;
-        },
-
-        // Replaces the settings of each processQueue item that
-        // are strings starting with an "@", using the remaining
-        // substring as key for the option map,
-        // e.g. "@autoUpload" is replaced with options.autoUpload:
-        _transformProcessQueue: function (options) {
-            var processQueue = [];
-            $.each(options.processQueue, function () {
-                var settings = {},
-                    action = this.action,
-                    prefix = this.prefix === true ? action : this.prefix;
-                $.each(this, function (key, value) {
-                    if ($.type(value) === 'string' &&
-                            value.charAt(0) === '@') {
-                        settings[key] = options[
-                            value.slice(1) || (prefix ? prefix +
-                                key.charAt(0).toUpperCase() + key.slice(1) : key)
-                        ];
-                    } else {
-                        settings[key] = value;
-                    }
-
-                });
-                processQueue.push(settings);
-            });
-            options.processQueue = processQueue;
-        },
-
-        // Returns the number of files currently in the processsing queue:
-        processing: function () {
-            return this._processing;
-        },
-
-        // Processes the files given as files property of the data parameter,
-        // returns a Promise object that allows to bind callbacks:
-        process: function (data) {
-            var that = this,
-                options = $.extend({}, this.options, data);
-            if (options.processQueue && options.processQueue.length) {
-                this._transformProcessQueue(options);
-                if (this._processing === 0) {
-                    this._trigger('processstart');
-                }
-                $.each(data.files, function (index) {
-                    var opts = index ? $.extend({}, options) : options,
-                        func = function () {
-                            if (data.errorThrown) {
-                                return $.Deferred()
-                                        .rejectWith(that, [data]).promise();
-                            }
-                            return that._processFile(opts, data);
-                        };
-                    opts.index = index;
-                    that._processing += 1;
-                    that._processingQueue = that._processingQueue.pipe(func, func)
-                        .always(function () {
-                            that._processing -= 1;
-                            if (that._processing === 0) {
-                                that._trigger('processstop');
-                            }
-                        });
-                });
-            }
-            return this._processingQueue;
-        },
-
-        _create: function () {
-            this._super();
-            this._processing = 0;
-            this._processingQueue = $.Deferred().resolveWith(this)
-                .promise();
-        }
-
-    });
-
-}));
diff --git a/vendor/assets/javascripts/fileupload/jquery.fileupload-ui.js b/vendor/assets/javascripts/fileupload/jquery.fileupload-ui.js
deleted file mode 100644
index 060d830a9e..0000000000
--- a/vendor/assets/javascripts/fileupload/jquery.fileupload-ui.js
+++ /dev/null
@@ -1,710 +0,0 @@
-/*
- * jQuery File Upload User Interface Plugin
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2010, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/* jshint nomen:false */
-/* global define, require, window */
-
-(function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define([
-            'jquery',
-            'tmpl',
-            './jquery.fileupload-image',
-            './jquery.fileupload-audio',
-            './jquery.fileupload-video',
-            './jquery.fileupload-validate'
-        ], factory);
-    } else if (typeof exports === 'object') {
-        // Node/CommonJS:
-        factory(
-            require('jquery'),
-            require('tmpl')
-        );
-    } else {
-        // Browser globals:
-        factory(
-            window.jQuery,
-            window.tmpl
-        );
-    }
-}(function ($, tmpl) {
-    'use strict';
-
-    $.blueimp.fileupload.prototype._specialOptions.push(
-        'filesContainer',
-        'uploadTemplateId',
-        'downloadTemplateId'
-    );
-
-    // The UI version extends the file upload widget
-    // and adds complete user interface interaction:
-    $.widget('blueimp.fileupload', $.blueimp.fileupload, {
-
-        options: {
-            // By default, files added to the widget are uploaded as soon
-            // as the user clicks on the start buttons. To enable automatic
-            // uploads, set the following option to true:
-            autoUpload: false,
-            // The ID of the upload template:
-            uploadTemplateId: 'template-upload',
-            // The ID of the download template:
-            downloadTemplateId: 'template-download',
-            // The container for the list of files. If undefined, it is set to
-            // an element with class "files" inside of the widget element:
-            filesContainer: undefined,
-            // By default, files are appended to the files container.
-            // Set the following option to true, to prepend files instead:
-            prependFiles: false,
-            // The expected data type of the upload response, sets the dataType
-            // option of the $.ajax upload requests:
-            dataType: 'json',
-
-            // Error and info messages:
-            messages: {
-                unknownError: 'Unknown error'
-            },
-
-            // Function returning the current number of files,
-            // used by the maxNumberOfFiles validation:
-            getNumberOfFiles: function () {
-                return this.filesContainer.children()
-                    .not('.processing').length;
-            },
-
-            // Callback to retrieve the list of files from the server response:
-            getFilesFromResponse: function (data) {
-                if (data.result && Array.isArray(data.result.files)) {
-                    return data.result.files;
-                }
-                return [];
-            },
-
-            // The add callback is invoked as soon as files are added to the fileupload
-            // widget (via file input selection, drag & drop or add API call).
-            // See the basic file upload widget for more information:
-            add: function (e, data) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                var $this = $(this),
-                    that = $this.data('blueimp-fileupload') ||
-                        $this.data('fileupload'),
-                    options = that.options;
-                data.context = that._renderUpload(data.files)
-                    .data('data', data)
-                    .addClass('processing');
-                options.filesContainer[
-                    options.prependFiles ? 'prepend' : 'append'
-                ](data.context);
-                that._forceReflow(data.context);
-                that._transition(data.context);
-                data.process(function () {
-                    return $this.fileupload('process', data);
-                }).always(function () {
-                    data.context.each(function (index) {
-                        $(this).find('.size').text(
-                            that._formatFileSize(data.files[index].size)
-                        );
-                    }).removeClass('processing');
-                    that._renderPreviews(data);
-                }).done(function () {
-                    data.context.find('.start').prop('disabled', false);
-                    if ((that._trigger('added', e, data) !== false) &&
-                            (options.autoUpload || data.autoUpload) &&
-                            data.autoUpload !== false) {
-                        data.submit();
-                    }
-                }).fail(function () {
-                    if (data.files.error) {
-                        data.context.each(function (index) {
-                            var error = data.files[index].error;
-                            if (error) {
-                                $(this).find('.error').text(error);
-                            }
-                        });
-                    }
-                });
-            },
-            // Callback for the start of each file upload request:
-            send: function (e, data) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                var that = $(this).data('blueimp-fileupload') ||
-                        $(this).data('fileupload');
-                if (data.context && data.dataType &&
-                        data.dataType.substr(0, 6) === 'iframe') {
-                    // Iframe Transport does not support progress events.
-                    // In lack of an indeterminate progress bar, we set
-                    // the progress to 100%, showing the full animated bar:
-                    data.context
-                        .find('.progress').addClass(
-                            !$.support.transition && 'progress-animated'
-                        )
-                        .attr('aria-valuenow', 100)
-                        .children().first().css(
-                            'width',
-                            '100%'
-                        );
-                }
-                return that._trigger('sent', e, data);
-            },
-            // Callback for successful uploads:
-            done: function (e, data) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                var that = $(this).data('blueimp-fileupload') ||
-                        $(this).data('fileupload'),
-                    getFilesFromResponse = data.getFilesFromResponse ||
-                        that.options.getFilesFromResponse,
-                    files = getFilesFromResponse(data),
-                    template,
-                    deferred;
-                if (data.context) {
-                    data.context.each(function (index) {
-                        var file = files[index] ||
-                                {error: 'Empty file upload result'};
-                        deferred = that._addFinishedDeferreds();
-                        that._transition($(this)).done(
-                            function () {
-                                var node = $(this);
-                                template = that._renderDownload([file])
-                                    .replaceAll(node);
-                                that._forceReflow(template);
-                                that._transition(template).done(
-                                    function () {
-                                        data.context = $(this);
-                                        that._trigger('completed', e, data);
-                                        that._trigger('finished', e, data);
-                                        deferred.resolve();
-                                    }
-                                );
-                            }
-                        );
-                    });
-                } else {
-                    template = that._renderDownload(files)[
-                        that.options.prependFiles ? 'prependTo' : 'appendTo'
-                    ](that.options.filesContainer);
-                    that._forceReflow(template);
-                    deferred = that._addFinishedDeferreds();
-                    that._transition(template).done(
-                        function () {
-                            data.context = $(this);
-                            that._trigger('completed', e, data);
-                            that._trigger('finished', e, data);
-                            deferred.resolve();
-                        }
-                    );
-                }
-            },
-            // Callback for failed (abort or error) uploads:
-            fail: function (e, data) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                var that = $(this).data('blueimp-fileupload') ||
-                        $(this).data('fileupload'),
-                    template,
-                    deferred;
-                if (data.context) {
-                    data.context.each(function (index) {
-                        if (data.errorThrown !== 'abort') {
-                            var file = data.files[index];
-                            file.error = file.error || data.errorThrown ||
-                                data.i18n('unknownError');
-                            deferred = that._addFinishedDeferreds();
-                            that._transition($(this)).done(
-                                function () {
-                                    var node = $(this);
-                                    template = that._renderDownload([file])
-                                        .replaceAll(node);
-                                    that._forceReflow(template);
-                                    that._transition(template).done(
-                                        function () {
-                                            data.context = $(this);
-                                            that._trigger('failed', e, data);
-                                            that._trigger('finished', e, data);
-                                            deferred.resolve();
-                                        }
-                                    );
-                                }
-                            );
-                        } else {
-                            deferred = that._addFinishedDeferreds();
-                            that._transition($(this)).done(
-                                function () {
-                                    $(this).remove();
-                                    that._trigger('failed', e, data);
-                                    that._trigger('finished', e, data);
-                                    deferred.resolve();
-                                }
-                            );
-                        }
-                    });
-                } else if (data.errorThrown !== 'abort') {
-                    data.context = that._renderUpload(data.files)[
-                        that.options.prependFiles ? 'prependTo' : 'appendTo'
-                    ](that.options.filesContainer)
-                        .data('data', data);
-                    that._forceReflow(data.context);
-                    deferred = that._addFinishedDeferreds();
-                    that._transition(data.context).done(
-                        function () {
-                            data.context = $(this);
-                            that._trigger('failed', e, data);
-                            that._trigger('finished', e, data);
-                            deferred.resolve();
-                        }
-                    );
-                } else {
-                    that._trigger('failed', e, data);
-                    that._trigger('finished', e, data);
-                    that._addFinishedDeferreds().resolve();
-                }
-            },
-            // Callback for upload progress events:
-            progress: function (e, data) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                var progress = Math.floor(data.loaded / data.total * 100);
-                if (data.context) {
-                    data.context.each(function () {
-                        $(this).find('.progress')
-                            .attr('aria-valuenow', progress)
-                            .children().first().css(
-                                'width',
-                                progress + '%'
-                            );
-                    });
-                }
-            },
-            // Callback for global upload progress events:
-            progressall: function (e, data) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                var $this = $(this),
-                    progress = Math.floor(data.loaded / data.total * 100),
-                    globalProgressNode = $this.find('.fileupload-progress'),
-                    extendedProgressNode = globalProgressNode
-                        .find('.progress-extended');
-                if (extendedProgressNode.length) {
-                    extendedProgressNode.html(
-                        ($this.data('blueimp-fileupload') || $this.data('fileupload'))
-                            ._renderExtendedProgress(data)
-                    );
-                }
-                globalProgressNode
-                    .find('.progress')
-                    .attr('aria-valuenow', progress)
-                    .children().first().css(
-                        'width',
-                        progress + '%'
-                    );
-            },
-            // Callback for uploads start, equivalent to the global ajaxStart event:
-            start: function (e) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                var that = $(this).data('blueimp-fileupload') ||
-                        $(this).data('fileupload');
-                that._resetFinishedDeferreds();
-                that._transition($(this).find('.fileupload-progress')).done(
-                    function () {
-                        that._trigger('started', e);
-                    }
-                );
-            },
-            // Callback for uploads stop, equivalent to the global ajaxStop event:
-            stop: function (e) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                var that = $(this).data('blueimp-fileupload') ||
-                        $(this).data('fileupload'),
-                    deferred = that._addFinishedDeferreds();
-                $.when.apply($, that._getFinishedDeferreds())
-                    .done(function () {
-                        that._trigger('stopped', e);
-                    });
-                that._transition($(this).find('.fileupload-progress')).done(
-                    function () {
-                        $(this).find('.progress')
-                            .attr('aria-valuenow', '0')
-                            .children().first().css('width', '0%');
-                        $(this).find('.progress-extended').html('&nbsp;');
-                        deferred.resolve();
-                    }
-                );
-            },
-            processstart: function (e) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                $(this).addClass('fileupload-processing');
-            },
-            processstop: function (e) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                $(this).removeClass('fileupload-processing');
-            },
-            // Callback for file deletion:
-            destroy: function (e, data) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                var that = $(this).data('blueimp-fileupload') ||
-                        $(this).data('fileupload'),
-                    removeNode = function () {
-                        that._transition(data.context).done(
-                            function () {
-                                $(this).remove();
-                                that._trigger('destroyed', e, data);
-                            }
-                        );
-                    };
-                if (data.url) {
-                    data.dataType = data.dataType || that.options.dataType;
-                    $.ajax(data).done(removeNode).fail(function () {
-                        that._trigger('destroyfailed', e, data);
-                    });
-                } else {
-                    removeNode();
-                }
-            }
-        },
-
-        _resetFinishedDeferreds: function () {
-            this._finishedUploads = [];
-        },
-
-        _addFinishedDeferreds: function (deferred) {
-            if (!deferred) {
-                deferred = $.Deferred();
-            }
-            this._finishedUploads.push(deferred);
-            return deferred;
-        },
-
-        _getFinishedDeferreds: function () {
-            return this._finishedUploads;
-        },
-
-        // Link handler, that allows to download files
-        // by drag & drop of the links to the desktop:
-        _enableDragToDesktop: function () {
-            var link = $(this),
-                url = link.prop('href'),
-                name = link.prop('download'),
-                type = 'application/octet-stream';
-            link.bind('dragstart', function (e) {
-                try {
-                    e.originalEvent.dataTransfer.setData(
-                        'DownloadURL',
-                        [type, name, url].join(':')
-                    );
-                } catch (ignore) {}
-            });
-        },
-
-        _formatFileSize: function (bytes) {
-            if (typeof bytes !== 'number') {
-                return '';
-            }
-            if (bytes >= 1000000000) {
-                return (bytes / 1000000000).toFixed(2) + ' GB';
-            }
-            if (bytes >= 1000000) {
-                return (bytes / 1000000).toFixed(2) + ' MB';
-            }
-            return (bytes / 1000).toFixed(2) + ' KB';
-        },
-
-        _formatBitrate: function (bits) {
-            if (typeof bits !== 'number') {
-                return '';
-            }
-            if (bits >= 1000000000) {
-                return (bits / 1000000000).toFixed(2) + ' Gbit/s';
-            }
-            if (bits >= 1000000) {
-                return (bits / 1000000).toFixed(2) + ' Mbit/s';
-            }
-            if (bits >= 1000) {
-                return (bits / 1000).toFixed(2) + ' kbit/s';
-            }
-            return bits.toFixed(2) + ' bit/s';
-        },
-
-        _formatTime: function (seconds) {
-            var date = new Date(seconds * 1000),
-                days = Math.floor(seconds / 86400);
-            days = days ? days + 'd ' : '';
-            return days +
-                ('0' + date.getUTCHours()).slice(-2) + ':' +
-                ('0' + date.getUTCMinutes()).slice(-2) + ':' +
-                ('0' + date.getUTCSeconds()).slice(-2);
-        },
-
-        _formatPercentage: function (floatValue) {
-            return (floatValue * 100).toFixed(2) + ' %';
-        },
-
-        _renderExtendedProgress: function (data) {
-            return this._formatBitrate(data.bitrate) + ' | ' +
-                this._formatTime(
-                    (data.total - data.loaded) * 8 / data.bitrate
-                ) + ' | ' +
-                this._formatPercentage(
-                    data.loaded / data.total
-                ) + ' | ' +
-                this._formatFileSize(data.loaded) + ' / ' +
-                this._formatFileSize(data.total);
-        },
-
-        _renderTemplate: function (func, files) {
-            if (!func) {
-                return $();
-            }
-            var result = func({
-                files: files,
-                formatFileSize: this._formatFileSize,
-                options: this.options
-            });
-            if (result instanceof $) {
-                return result;
-            }
-            return $(this.options.templatesContainer).html(result).children();
-        },
-
-        _renderPreviews: function (data) {
-            data.context.find('.preview').each(function (index, elm) {
-                $(elm).append(data.files[index].preview);
-            });
-        },
-
-        _renderUpload: function (files) {
-            return this._renderTemplate(
-                this.options.uploadTemplate,
-                files
-            );
-        },
-
-        _renderDownload: function (files) {
-            return this._renderTemplate(
-                this.options.downloadTemplate,
-                files
-            ).find('a[download]').each(this._enableDragToDesktop).end();
-        },
-
-        _startHandler: function (e) {
-            e.preventDefault();
-            var button = $(e.currentTarget),
-                template = button.closest('.template-upload'),
-                data = template.data('data');
-            button.prop('disabled', true);
-            if (data && data.submit) {
-                data.submit();
-            }
-        },
-
-        _cancelHandler: function (e) {
-            e.preventDefault();
-            var template = $(e.currentTarget)
-                    .closest('.template-upload,.template-download'),
-                data = template.data('data') || {};
-            data.context = data.context || template;
-            if (data.abort) {
-                data.abort();
-            } else {
-                data.errorThrown = 'abort';
-                this._trigger('fail', e, data);
-            }
-        },
-
-        _deleteHandler: function (e) {
-            e.preventDefault();
-            var button = $(e.currentTarget);
-            this._trigger('destroy', e, $.extend({
-                context: button.closest('.template-download'),
-                type: 'DELETE'
-            }, button.data()));
-        },
-
-        _forceReflow: function (node) {
-            return $.support.transition && node.length &&
-                node[0].offsetWidth;
-        },
-
-        _transition: function (node) {
-            var dfd = $.Deferred();
-            if ($.support.transition && node.hasClass('fade') && node.is(':visible')) {
-                node.bind(
-                    $.support.transition.end,
-                    function (e) {
-                        // Make sure we don't respond to other transitions events
-                        // in the container element, e.g. from button elements:
-                        if (e.target === node[0]) {
-                            node.unbind($.support.transition.end);
-                            dfd.resolveWith(node);
-                        }
-                    }
-                ).toggleClass('in');
-            } else {
-                node.toggleClass('in');
-                dfd.resolveWith(node);
-            }
-            return dfd;
-        },
-
-        _initButtonBarEventHandlers: function () {
-            var fileUploadButtonBar = this.element.find('.fileupload-buttonbar'),
-                filesList = this.options.filesContainer;
-            this._on(fileUploadButtonBar.find('.start'), {
-                click: function (e) {
-                    e.preventDefault();
-                    filesList.find('.start').click();
-                }
-            });
-            this._on(fileUploadButtonBar.find('.cancel'), {
-                click: function (e) {
-                    e.preventDefault();
-                    filesList.find('.cancel').click();
-                }
-            });
-            this._on(fileUploadButtonBar.find('.delete'), {
-                click: function (e) {
-                    e.preventDefault();
-                    filesList.find('.toggle:checked')
-                        .closest('.template-download')
-                        .find('.delete').click();
-                    fileUploadButtonBar.find('.toggle')
-                        .prop('checked', false);
-                }
-            });
-            this._on(fileUploadButtonBar.find('.toggle'), {
-                change: function (e) {
-                    filesList.find('.toggle').prop(
-                        'checked',
-                        $(e.currentTarget).is(':checked')
-                    );
-                }
-            });
-        },
-
-        _destroyButtonBarEventHandlers: function () {
-            this._off(
-                this.element.find('.fileupload-buttonbar')
-                    .find('.start, .cancel, .delete'),
-                'click'
-            );
-            this._off(
-                this.element.find('.fileupload-buttonbar .toggle'),
-                'change.'
-            );
-        },
-
-        _initEventHandlers: function () {
-            this._super();
-            this._on(this.options.filesContainer, {
-                'click .start': this._startHandler,
-                'click .cancel': this._cancelHandler,
-                'click .delete': this._deleteHandler
-            });
-            this._initButtonBarEventHandlers();
-        },
-
-        _destroyEventHandlers: function () {
-            this._destroyButtonBarEventHandlers();
-            this._off(this.options.filesContainer, 'click');
-            this._super();
-        },
-
-        _enableFileInputButton: function () {
-            this.element.find('.fileinput-button input')
-                .prop('disabled', false)
-                .parent().removeClass('disabled');
-        },
-
-        _disableFileInputButton: function () {
-            this.element.find('.fileinput-button input')
-                .prop('disabled', true)
-                .parent().addClass('disabled');
-        },
-
-        _initTemplates: function () {
-            var options = this.options;
-            options.templatesContainer = this.document[0].createElement(
-                options.filesContainer.prop('nodeName')
-            );
-            if (tmpl) {
-                if (options.uploadTemplateId) {
-                    options.uploadTemplate = tmpl(options.uploadTemplateId);
-                }
-                if (options.downloadTemplateId) {
-                    options.downloadTemplate = tmpl(options.downloadTemplateId);
-                }
-            }
-        },
-
-        _initFilesContainer: function () {
-            var options = this.options;
-            if (options.filesContainer === undefined) {
-                options.filesContainer = this.element.find('.files');
-            } else if (!(options.filesContainer instanceof $)) {
-                options.filesContainer = $(options.filesContainer);
-            }
-        },
-
-        _initSpecialOptions: function () {
-            this._super();
-            this._initFilesContainer();
-            this._initTemplates();
-        },
-
-        _create: function () {
-            this._super();
-            this._resetFinishedDeferreds();
-            if (!$.support.fileInput) {
-                this._disableFileInputButton();
-            }
-        },
-
-        enable: function () {
-            var wasDisabled = false;
-            if (this.options.disabled) {
-                wasDisabled = true;
-            }
-            this._super();
-            if (wasDisabled) {
-                this.element.find('input, button').prop('disabled', false);
-                this._enableFileInputButton();
-            }
-        },
-
-        disable: function () {
-            if (!this.options.disabled) {
-                this.element.find('input, button').prop('disabled', true);
-                this._disableFileInputButton();
-            }
-            this._super();
-        }
-
-    });
-
-}));
diff --git a/vendor/assets/javascripts/fileupload/jquery.fileupload-validate.js b/vendor/assets/javascripts/fileupload/jquery.fileupload-validate.js
deleted file mode 100644
index d6f754cd86..0000000000
--- a/vendor/assets/javascripts/fileupload/jquery.fileupload-validate.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * jQuery File Upload Validation Plugin
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2013, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/* global define, require, window */
-
-(function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define([
-            'jquery',
-            './jquery.fileupload-process'
-        ], factory);
-    } else if (typeof exports === 'object') {
-        // Node/CommonJS:
-        factory(require('jquery'));
-    } else {
-        // Browser globals:
-        factory(
-            window.jQuery
-        );
-    }
-}(function ($) {
-    'use strict';
-
-    // Append to the default processQueue:
-    $.blueimp.fileupload.prototype.options.processQueue.push(
-        {
-            action: 'validate',
-            // Always trigger this action,
-            // even if the previous action was rejected:
-            always: true,
-            // Options taken from the global options map:
-            acceptFileTypes: '@',
-            maxFileSize: '@',
-            minFileSize: '@',
-            maxNumberOfFiles: '@',
-            disabled: '@disableValidation'
-        }
-    );
-
-    // The File Upload Validation plugin extends the fileupload widget
-    // with file validation functionality:
-    $.widget('blueimp.fileupload', $.blueimp.fileupload, {
-
-        options: {
-            /*
-            // The regular expression for allowed file types, matches
-            // against either file type or file name:
-            acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
-            // The maximum allowed file size in bytes:
-            maxFileSize: 10000000, // 10 MB
-            // The minimum allowed file size in bytes:
-            minFileSize: undefined, // No minimal file size
-            // The limit of files to be uploaded:
-            maxNumberOfFiles: 10,
-            */
-
-            // Function returning the current number of files,
-            // has to be overriden for maxNumberOfFiles validation:
-            getNumberOfFiles: $.noop,
-
-            // Error and info messages:
-            messages: {
-                maxNumberOfFiles: 'Maximum number of files exceeded',
-                acceptFileTypes: 'File type not allowed',
-                maxFileSize: 'File is too large',
-                minFileSize: 'File is too small'
-            }
-        },
-
-        processActions: {
-
-            validate: function (data, options) {
-                if (options.disabled) {
-                    return data;
-                }
-                var dfd = $.Deferred(),
-                    settings = this.options,
-                    file = data.files[data.index],
-                    fileSize;
-                if (options.minFileSize || options.maxFileSize) {
-                    fileSize = file.size;
-                }
-                if ($.type(options.maxNumberOfFiles) === 'number' &&
-                        (settings.getNumberOfFiles() || 0) + data.files.length >
-                            options.maxNumberOfFiles) {
-                    file.error = settings.i18n('maxNumberOfFiles');
-                } else if (options.acceptFileTypes &&
-                        !(options.acceptFileTypes.test(file.type) ||
-                        options.acceptFileTypes.test(file.name))) {
-                    file.error = settings.i18n('acceptFileTypes');
-                } else if (fileSize > options.maxFileSize) {
-                    file.error = settings.i18n('maxFileSize');
-                } else if ($.type(fileSize) === 'number' &&
-                        fileSize < options.minFileSize) {
-                    file.error = settings.i18n('minFileSize');
-                } else {
-                    delete file.error;
-                }
-                if (file.error || data.files.error) {
-                    data.files.error = true;
-                    dfd.rejectWith(this, [data]);
-                } else {
-                    dfd.resolveWith(this, [data]);
-                }
-                return dfd.promise();
-            }
-
-        }
-
-    });
-
-}));
diff --git a/vendor/assets/javascripts/fileupload/jquery.fileupload.js b/vendor/assets/javascripts/fileupload/jquery.fileupload.js
deleted file mode 100644
index f06df007de..0000000000
--- a/vendor/assets/javascripts/fileupload/jquery.fileupload.js
+++ /dev/null
@@ -1,1477 +0,0 @@
-/*
- * jQuery File Upload Plugin
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2010, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/* jshint nomen:false */
-/* global define, require, window, document, location, Blob, FormData */
-
-(function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define([
-            'jquery',
-            'jquery.ui.widget'
-        ], factory);
-    } else if (typeof exports === 'object') {
-        // Node/CommonJS:
-        factory(
-            require('jquery'),
-            require('./vendor/jquery.ui.widget')
-        );
-    } else {
-        // Browser globals:
-        factory(window.jQuery);
-    }
-}(function ($) {
-    'use strict';
-
-    // Detect file input support, based on
-    // http://viljamis.com/blog/2012/file-upload-support-on-mobile/
-    $.support.fileInput = !(new RegExp(
-        // Handle devices which give false positives for the feature detection:
-        '(Android (1\\.[0156]|2\\.[01]))' +
-            '|(Windows Phone (OS 7|8\\.0))|(XBLWP)|(ZuneWP)|(WPDesktop)' +
-            '|(w(eb)?OSBrowser)|(webOS)' +
-            '|(Kindle/(1\\.0|2\\.[05]|3\\.0))'
-    ).test(window.navigator.userAgent) ||
-        // Feature detection for all other devices:
-        $('<input type="file">').prop('disabled'));
-
-    // The FileReader API is not actually used, but works as feature detection,
-    // as some Safari versions (5?) support XHR file uploads via the FormData API,
-    // but not non-multipart XHR file uploads.
-    // window.XMLHttpRequestUpload is not available on IE10, so we check for
-    // window.ProgressEvent instead to detect XHR2 file upload capability:
-    $.support.xhrFileUpload = !!(window.ProgressEvent && window.FileReader);
-    $.support.xhrFormDataFileUpload = !!window.FormData;
-
-    // Detect support for Blob slicing (required for chunked uploads):
-    $.support.blobSlice = window.Blob && (Blob.prototype.slice ||
-        Blob.prototype.webkitSlice || Blob.prototype.mozSlice);
-
-    // Helper function to create drag handlers for dragover/dragenter/dragleave:
-    function getDragHandler(type) {
-        var isDragOver = type === 'dragover';
-        return function (e) {
-            e.dataTransfer = e.originalEvent && e.originalEvent.dataTransfer;
-            var dataTransfer = e.dataTransfer;
-            if (dataTransfer && $.inArray('Files', dataTransfer.types) !== -1 &&
-                    this._trigger(
-                        type,
-                        $.Event(type, {delegatedEvent: e})
-                    ) !== false) {
-                e.preventDefault();
-                if (isDragOver) {
-                    dataTransfer.dropEffect = 'copy';
-                }
-            }
-        };
-    }
-
-    // The fileupload widget listens for change events on file input fields defined
-    // via fileInput setting and paste or drop events of the given dropZone.
-    // In addition to the default jQuery Widget methods, the fileupload widget
-    // exposes the "add" and "send" methods, to add or directly send files using
-    // the fileupload API.
-    // By default, files added via file input selection, paste, drag & drop or
-    // "add" method are uploaded immediately, but it is possible to override
-    // the "add" callback option to queue file uploads.
-    $.widget('blueimp.fileupload', {
-
-        options: {
-            // The drop target element(s), by the default the complete document.
-            // Set to null to disable drag & drop support:
-            dropZone: $(document),
-            // The paste target element(s), by the default undefined.
-            // Set to a DOM node or jQuery object to enable file pasting:
-            pasteZone: undefined,
-            // The file input field(s), that are listened to for change events.
-            // If undefined, it is set to the file input fields inside
-            // of the widget element on plugin initialization.
-            // Set to null to disable the change listener.
-            fileInput: undefined,
-            // By default, the file input field is replaced with a clone after
-            // each input field change event. This is required for iframe transport
-            // queues and allows change events to be fired for the same file
-            // selection, but can be disabled by setting the following option to false:
-            replaceFileInput: true,
-            // The parameter name for the file form data (the request argument name).
-            // If undefined or empty, the name property of the file input field is
-            // used, or "files[]" if the file input name property is also empty,
-            // can be a string or an array of strings:
-            paramName: undefined,
-            // By default, each file of a selection is uploaded using an individual
-            // request for XHR type uploads. Set to false to upload file
-            // selections in one request each:
-            singleFileUploads: true,
-            // To limit the number of files uploaded with one XHR request,
-            // set the following option to an integer greater than 0:
-            limitMultiFileUploads: undefined,
-            // The following option limits the number of files uploaded with one
-            // XHR request to keep the request size under or equal to the defined
-            // limit in bytes:
-            limitMultiFileUploadSize: undefined,
-            // Multipart file uploads add a number of bytes to each uploaded file,
-            // therefore the following option adds an overhead for each file used
-            // in the limitMultiFileUploadSize configuration:
-            limitMultiFileUploadSizeOverhead: 512,
-            // Set the following option to true to issue all file upload requests
-            // in a sequential order:
-            sequentialUploads: false,
-            // To limit the number of concurrent uploads,
-            // set the following option to an integer greater than 0:
-            limitConcurrentUploads: undefined,
-            // Set the following option to true to force iframe transport uploads:
-            forceIframeTransport: false,
-            // Set the following option to the location of a redirect url on the
-            // origin server, for cross-domain iframe transport uploads:
-            redirect: undefined,
-            // The parameter name for the redirect url, sent as part of the form
-            // data and set to 'redirect' if this option is empty:
-            redirectParamName: undefined,
-            // Set the following option to the location of a postMessage window,
-            // to enable postMessage transport uploads:
-            postMessage: undefined,
-            // By default, XHR file uploads are sent as multipart/form-data.
-            // The iframe transport is always using multipart/form-data.
-            // Set to false to enable non-multipart XHR uploads:
-            multipart: true,
-            // To upload large files in smaller chunks, set the following option
-            // to a preferred maximum chunk size. If set to 0, null or undefined,
-            // or the browser does not support the required Blob API, files will
-            // be uploaded as a whole.
-            maxChunkSize: undefined,
-            // When a non-multipart upload or a chunked multipart upload has been
-            // aborted, this option can be used to resume the upload by setting
-            // it to the size of the already uploaded bytes. This option is most
-            // useful when modifying the options object inside of the "add" or
-            // "send" callbacks, as the options are cloned for each file upload.
-            uploadedBytes: undefined,
-            // By default, failed (abort or error) file uploads are removed from the
-            // global progress calculation. Set the following option to false to
-            // prevent recalculating the global progress data:
-            recalculateProgress: true,
-            // Interval in milliseconds to calculate and trigger progress events:
-            progressInterval: 100,
-            // Interval in milliseconds to calculate progress bitrate:
-            bitrateInterval: 500,
-            // By default, uploads are started automatically when adding files:
-            autoUpload: true,
-
-            // Error and info messages:
-            messages: {
-                uploadedBytes: 'Uploaded bytes exceed file size'
-            },
-
-            // Translation function, gets the message key to be translated
-            // and an object with context specific data as arguments:
-            i18n: function (message, context) {
-                message = this.messages[message] || message.toString();
-                if (context) {
-                    $.each(context, function (key, value) {
-                        message = message.replace('{' + key + '}', value);
-                    });
-                }
-                return message;
-            },
-
-            // Additional form data to be sent along with the file uploads can be set
-            // using this option, which accepts an array of objects with name and
-            // value properties, a function returning such an array, a FormData
-            // object (for XHR file uploads), or a simple object.
-            // The form of the first fileInput is given as parameter to the function:
-            formData: function (form) {
-                return form.serializeArray();
-            },
-
-            // The add callback is invoked as soon as files are added to the fileupload
-            // widget (via file input selection, drag & drop, paste or add API call).
-            // If the singleFileUploads option is enabled, this callback will be
-            // called once for each file in the selection for XHR file uploads, else
-            // once for each file selection.
-            //
-            // The upload starts when the submit method is invoked on the data parameter.
-            // The data object contains a files property holding the added files
-            // and allows you to override plugin options as well as define ajax settings.
-            //
-            // Listeners for this callback can also be bound the following way:
-            // .bind('fileuploadadd', func);
-            //
-            // data.submit() returns a Promise object and allows to attach additional
-            // handlers using jQuery's Deferred callbacks:
-            // data.submit().done(func).fail(func).always(func);
-            add: function (e, data) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                if (data.autoUpload || (data.autoUpload !== false &&
-                        $(this).fileupload('option', 'autoUpload'))) {
-                    data.process().done(function () {
-                        data.submit();
-                    });
-                }
-            },
-
-            // Other callbacks:
-
-            // Callback for the submit event of each file upload:
-            // submit: function (e, data) {}, // .bind('fileuploadsubmit', func);
-
-            // Callback for the start of each file upload request:
-            // send: function (e, data) {}, // .bind('fileuploadsend', func);
-
-            // Callback for successful uploads:
-            // done: function (e, data) {}, // .bind('fileuploaddone', func);
-
-            // Callback for failed (abort or error) uploads:
-            // fail: function (e, data) {}, // .bind('fileuploadfail', func);
-
-            // Callback for completed (success, abort or error) requests:
-            // always: function (e, data) {}, // .bind('fileuploadalways', func);
-
-            // Callback for upload progress events:
-            // progress: function (e, data) {}, // .bind('fileuploadprogress', func);
-
-            // Callback for global upload progress events:
-            // progressall: function (e, data) {}, // .bind('fileuploadprogressall', func);
-
-            // Callback for uploads start, equivalent to the global ajaxStart event:
-            // start: function (e) {}, // .bind('fileuploadstart', func);
-
-            // Callback for uploads stop, equivalent to the global ajaxStop event:
-            // stop: function (e) {}, // .bind('fileuploadstop', func);
-
-            // Callback for change events of the fileInput(s):
-            // change: function (e, data) {}, // .bind('fileuploadchange', func);
-
-            // Callback for paste events to the pasteZone(s):
-            // paste: function (e, data) {}, // .bind('fileuploadpaste', func);
-
-            // Callback for drop events of the dropZone(s):
-            // drop: function (e, data) {}, // .bind('fileuploaddrop', func);
-
-            // Callback for dragover events of the dropZone(s):
-            // dragover: function (e) {}, // .bind('fileuploaddragover', func);
-
-            // Callback for the start of each chunk upload request:
-            // chunksend: function (e, data) {}, // .bind('fileuploadchunksend', func);
-
-            // Callback for successful chunk uploads:
-            // chunkdone: function (e, data) {}, // .bind('fileuploadchunkdone', func);
-
-            // Callback for failed (abort or error) chunk uploads:
-            // chunkfail: function (e, data) {}, // .bind('fileuploadchunkfail', func);
-
-            // Callback for completed (success, abort or error) chunk upload requests:
-            // chunkalways: function (e, data) {}, // .bind('fileuploadchunkalways', func);
-
-            // The plugin options are used as settings object for the ajax calls.
-            // The following are jQuery ajax settings required for the file uploads:
-            processData: false,
-            contentType: false,
-            cache: false,
-            timeout: 0
-        },
-
-        // A list of options that require reinitializing event listeners and/or
-        // special initialization code:
-        _specialOptions: [
-            'fileInput',
-            'dropZone',
-            'pasteZone',
-            'multipart',
-            'forceIframeTransport'
-        ],
-
-        _blobSlice: $.support.blobSlice && function () {
-            var slice = this.slice || this.webkitSlice || this.mozSlice;
-            return slice.apply(this, arguments);
-        },
-
-        _BitrateTimer: function () {
-            this.timestamp = ((Date.now) ? Date.now() : (new Date()).getTime());
-            this.loaded = 0;
-            this.bitrate = 0;
-            this.getBitrate = function (now, loaded, interval) {
-                var timeDiff = now - this.timestamp;
-                if (!this.bitrate || !interval || timeDiff > interval) {
-                    this.bitrate = (loaded - this.loaded) * (1000 / timeDiff) * 8;
-                    this.loaded = loaded;
-                    this.timestamp = now;
-                }
-                return this.bitrate;
-            };
-        },
-
-        _isXHRUpload: function (options) {
-            return !options.forceIframeTransport &&
-                ((!options.multipart && $.support.xhrFileUpload) ||
-                $.support.xhrFormDataFileUpload);
-        },
-
-        _getFormData: function (options) {
-            var formData;
-            if ($.type(options.formData) === 'function') {
-                return options.formData(options.form);
-            }
-            if (Array.isArray(options.formData)) {
-                return options.formData;
-            }
-            if ($.type(options.formData) === 'object') {
-                formData = [];
-                $.each(options.formData, function (name, value) {
-                    formData.push({name: name, value: value});
-                });
-                return formData;
-            }
-            return [];
-        },
-
-        _getTotal: function (files) {
-            var total = 0;
-            $.each(files, function (index, file) {
-                total += file.size || 1;
-            });
-            return total;
-        },
-
-        _initProgressObject: function (obj) {
-            var progress = {
-                loaded: 0,
-                total: 0,
-                bitrate: 0
-            };
-            if (obj._progress) {
-                $.extend(obj._progress, progress);
-            } else {
-                obj._progress = progress;
-            }
-        },
-
-        _initResponseObject: function (obj) {
-            var prop;
-            if (obj._response) {
-                for (prop in obj._response) {
-                    if (obj._response.hasOwnProperty(prop)) {
-                        delete obj._response[prop];
-                    }
-                }
-            } else {
-                obj._response = {};
-            }
-        },
-
-        _onProgress: function (e, data) {
-            if (e.lengthComputable) {
-                var now = ((Date.now) ? Date.now() : (new Date()).getTime()),
-                    loaded;
-                if (data._time && data.progressInterval &&
-                        (now - data._time < data.progressInterval) &&
-                        e.loaded !== e.total) {
-                    return;
-                }
-                data._time = now;
-                loaded = Math.floor(
-                    e.loaded / e.total * (data.chunkSize || data._progress.total)
-                ) + (data.uploadedBytes || 0);
-                // Add the difference from the previously loaded state
-                // to the global loaded counter:
-                this._progress.loaded += (loaded - data._progress.loaded);
-                this._progress.bitrate = this._bitrateTimer.getBitrate(
-                    now,
-                    this._progress.loaded,
-                    data.bitrateInterval
-                );
-                data._progress.loaded = data.loaded = loaded;
-                data._progress.bitrate = data.bitrate = data._bitrateTimer.getBitrate(
-                    now,
-                    loaded,
-                    data.bitrateInterval
-                );
-                // Trigger a custom progress event with a total data property set
-                // to the file size(s) of the current upload and a loaded data
-                // property calculated accordingly:
-                this._trigger(
-                    'progress',
-                    $.Event('progress', {delegatedEvent: e}),
-                    data
-                );
-                // Trigger a global progress event for all current file uploads,
-                // including ajax calls queued for sequential file uploads:
-                this._trigger(
-                    'progressall',
-                    $.Event('progressall', {delegatedEvent: e}),
-                    this._progress
-                );
-            }
-        },
-
-        _initProgressListener: function (options) {
-            var that = this,
-                xhr = options.xhr ? options.xhr() : $.ajaxSettings.xhr();
-            // Accesss to the native XHR object is required to add event listeners
-            // for the upload progress event:
-            if (xhr.upload) {
-                $(xhr.upload).bind('progress', function (e) {
-                    var oe = e.originalEvent;
-                    // Make sure the progress event properties get copied over:
-                    e.lengthComputable = oe.lengthComputable;
-                    e.loaded = oe.loaded;
-                    e.total = oe.total;
-                    that._onProgress(e, options);
-                });
-                options.xhr = function () {
-                    return xhr;
-                };
-            }
-        },
-
-        _isInstanceOf: function (type, obj) {
-            // Cross-frame instanceof check
-            return Object.prototype.toString.call(obj) === '[object ' + type + ']';
-        },
-
-        _initXHRData: function (options) {
-            var that = this,
-                formData,
-                file = options.files[0],
-                // Ignore non-multipart setting if not supported:
-                multipart = options.multipart || !$.support.xhrFileUpload,
-                paramName = $.type(options.paramName) === 'array' ?
-                    options.paramName[0] : options.paramName;
-            options.headers = $.extend({}, options.headers);
-            if (options.contentRange) {
-                options.headers['Content-Range'] = options.contentRange;
-            }
-            if (!multipart || options.blob || !this._isInstanceOf('File', file)) {
-                options.headers['Content-Disposition'] = 'attachment; filename="' +
-                    encodeURI(file.name) + '"';
-            }
-            if (!multipart) {
-                options.contentType = file.type || 'application/octet-stream';
-                options.data = options.blob || file;
-            } else if ($.support.xhrFormDataFileUpload) {
-                if (options.postMessage) {
-                    // window.postMessage does not allow sending FormData
-                    // objects, so we just add the File/Blob objects to
-                    // the formData array and let the postMessage window
-                    // create the FormData object out of this array:
-                    formData = this._getFormData(options);
-                    if (options.blob) {
-                        formData.push({
-                            name: paramName,
-                            value: options.blob
-                        });
-                    } else {
-                        $.each(options.files, function (index, file) {
-                            formData.push({
-                                name: ($.type(options.paramName) === 'array' &&
-                                    options.paramName[index]) || paramName,
-                                value: file
-                            });
-                        });
-                    }
-                } else {
-                    if (that._isInstanceOf('FormData', options.formData)) {
-                        formData = options.formData;
-                    } else {
-                        formData = new FormData();
-                        $.each(this._getFormData(options), function (index, field) {
-                            formData.append(field.name, field.value);
-                        });
-                    }
-                    if (options.blob) {
-                        formData.append(paramName, options.blob, file.name);
-                    } else {
-                        $.each(options.files, function (index, file) {
-                            // This check allows the tests to run with
-                            // dummy objects:
-                            if (that._isInstanceOf('File', file) ||
-                                    that._isInstanceOf('Blob', file)) {
-                                formData.append(
-                                    ($.type(options.paramName) === 'array' &&
-                                        options.paramName[index]) || paramName,
-                                    file,
-                                    file.uploadName || file.name
-                                );
-                            }
-                        });
-                    }
-                }
-                options.data = formData;
-            }
-            // Blob reference is not needed anymore, free memory:
-            options.blob = null;
-        },
-
-        _initIframeSettings: function (options) {
-            var targetHost = $('<a></a>').prop('href', options.url).prop('host');
-            // Setting the dataType to iframe enables the iframe transport:
-            options.dataType = 'iframe ' + (options.dataType || '');
-            // The iframe transport accepts a serialized array as form data:
-            options.formData = this._getFormData(options);
-            // Add redirect url to form data on cross-domain uploads:
-            if (options.redirect && targetHost && targetHost !== location.host) {
-                options.formData.push({
-                    name: options.redirectParamName || 'redirect',
-                    value: options.redirect
-                });
-            }
-        },
-
-        _initDataSettings: function (options) {
-            if (this._isXHRUpload(options)) {
-                if (!this._chunkedUpload(options, true)) {
-                    if (!options.data) {
-                        this._initXHRData(options);
-                    }
-                    this._initProgressListener(options);
-                }
-                if (options.postMessage) {
-                    // Setting the dataType to postmessage enables the
-                    // postMessage transport:
-                    options.dataType = 'postmessage ' + (options.dataType || '');
-                }
-            } else {
-                this._initIframeSettings(options);
-            }
-        },
-
-        _getParamName: function (options) {
-            var fileInput = $(options.fileInput),
-                paramName = options.paramName;
-            if (!paramName) {
-                paramName = [];
-                fileInput.each(function () {
-                    var input = $(this),
-                        name = input.prop('name') || 'files[]',
-                        i = (input.prop('files') || [1]).length;
-                    while (i) {
-                        paramName.push(name);
-                        i -= 1;
-                    }
-                });
-                if (!paramName.length) {
-                    paramName = [fileInput.prop('name') || 'files[]'];
-                }
-            } else if (!Array.isArray(paramName)) {
-                paramName = [paramName];
-            }
-            return paramName;
-        },
-
-        _initFormSettings: function (options) {
-            // Retrieve missing options from the input field and the
-            // associated form, if available:
-            if (!options.form || !options.form.length) {
-                options.form = $(options.fileInput.prop('form'));
-                // If the given file input doesn't have an associated form,
-                // use the default widget file input's form:
-                if (!options.form.length) {
-                    options.form = $(this.options.fileInput.prop('form'));
-                }
-            }
-            options.paramName = this._getParamName(options);
-            if (!options.url) {
-                options.url = options.form.prop('action') || location.href;
-            }
-            // The HTTP request method must be "POST" or "PUT":
-            options.type = (options.type ||
-                ($.type(options.form.prop('method')) === 'string' &&
-                    options.form.prop('method')) || ''
-                ).toUpperCase();
-            if (options.type !== 'POST' && options.type !== 'PUT' &&
-                    options.type !== 'PATCH') {
-                options.type = 'POST';
-            }
-            if (!options.formAcceptCharset) {
-                options.formAcceptCharset = options.form.attr('accept-charset');
-            }
-        },
-
-        _getAJAXSettings: function (data) {
-            var options = $.extend({}, this.options, data);
-            this._initFormSettings(options);
-            this._initDataSettings(options);
-            return options;
-        },
-
-        // jQuery 1.6 doesn't provide .state(),
-        // while jQuery 1.8+ removed .isRejected() and .isResolved():
-        _getDeferredState: function (deferred) {
-            if (deferred.state) {
-                return deferred.state();
-            }
-            if (deferred.isResolved()) {
-                return 'resolved';
-            }
-            if (deferred.isRejected()) {
-                return 'rejected';
-            }
-            return 'pending';
-        },
-
-        // Maps jqXHR callbacks to the equivalent
-        // methods of the given Promise object:
-        _enhancePromise: function (promise) {
-            promise.success = promise.done;
-            promise.error = promise.fail;
-            promise.complete = promise.always;
-            return promise;
-        },
-
-        // Creates and returns a Promise object enhanced with
-        // the jqXHR methods abort, success, error and complete:
-        _getXHRPromise: function (resolveOrReject, context, args) {
-            var dfd = $.Deferred(),
-                promise = dfd.promise();
-            context = context || this.options.context || promise;
-            if (resolveOrReject === true) {
-                dfd.resolveWith(context, args);
-            } else if (resolveOrReject === false) {
-                dfd.rejectWith(context, args);
-            }
-            promise.abort = dfd.promise;
-            return this._enhancePromise(promise);
-        },
-
-        // Adds convenience methods to the data callback argument:
-        _addConvenienceMethods: function (e, data) {
-            var that = this,
-                getPromise = function (args) {
-                    return $.Deferred().resolveWith(that, args).promise();
-                };
-            data.process = function (resolveFunc, rejectFunc) {
-                if (resolveFunc || rejectFunc) {
-                    data._processQueue = this._processQueue =
-                        (this._processQueue || getPromise([this])).pipe(
-                            function () {
-                                if (data.errorThrown) {
-                                    return $.Deferred()
-                                        .rejectWith(that, [data]).promise();
-                                }
-                                return getPromise(arguments);
-                            }
-                        ).pipe(resolveFunc, rejectFunc);
-                }
-                return this._processQueue || getPromise([this]);
-            };
-            data.submit = function () {
-                if (this.state() !== 'pending') {
-                    data.jqXHR = this.jqXHR =
-                        (that._trigger(
-                            'submit',
-                            $.Event('submit', {delegatedEvent: e}),
-                            this
-                        ) !== false) && that._onSend(e, this);
-                }
-                return this.jqXHR || that._getXHRPromise();
-            };
-            data.abort = function () {
-                if (this.jqXHR) {
-                    return this.jqXHR.abort();
-                }
-                this.errorThrown = 'abort';
-                that._trigger('fail', null, this);
-                return that._getXHRPromise(false);
-            };
-            data.state = function () {
-                if (this.jqXHR) {
-                    return that._getDeferredState(this.jqXHR);
-                }
-                if (this._processQueue) {
-                    return that._getDeferredState(this._processQueue);
-                }
-            };
-            data.processing = function () {
-                return !this.jqXHR && this._processQueue && that
-                    ._getDeferredState(this._processQueue) === 'pending';
-            };
-            data.progress = function () {
-                return this._progress;
-            };
-            data.response = function () {
-                return this._response;
-            };
-        },
-
-        // Parses the Range header from the server response
-        // and returns the uploaded bytes:
-        _getUploadedBytes: function (jqXHR) {
-            var range = jqXHR.getResponseHeader('Range'),
-                parts = range && range.split('-'),
-                upperBytesPos = parts && parts.length > 1 &&
-                    parseInt(parts[1], 10);
-            return upperBytesPos && upperBytesPos + 1;
-        },
-
-        // Uploads a file in multiple, sequential requests
-        // by splitting the file up in multiple blob chunks.
-        // If the second parameter is true, only tests if the file
-        // should be uploaded in chunks, but does not invoke any
-        // upload requests:
-        _chunkedUpload: function (options, testOnly) {
-            options.uploadedBytes = options.uploadedBytes || 0;
-            var that = this,
-                file = options.files[0],
-                fs = file.size,
-                ub = options.uploadedBytes,
-                mcs = options.maxChunkSize || fs,
-                slice = this._blobSlice,
-                dfd = $.Deferred(),
-                promise = dfd.promise(),
-                jqXHR,
-                upload;
-            if (!(this._isXHRUpload(options) && slice && (ub || mcs < fs)) ||
-                    options.data) {
-                return false;
-            }
-            if (testOnly) {
-                return true;
-            }
-            if (ub >= fs) {
-                file.error = options.i18n('uploadedBytes');
-                return this._getXHRPromise(
-                    false,
-                    options.context,
-                    [null, 'error', file.error]
-                );
-            }
-            // The chunk upload method:
-            upload = function () {
-                // Clone the options object for each chunk upload:
-                var o = $.extend({}, options),
-                    currentLoaded = o._progress.loaded;
-                o.blob = slice.call(
-                    file,
-                    ub,
-                    ub + mcs,
-                    file.type
-                );
-                // Store the current chunk size, as the blob itself
-                // will be dereferenced after data processing:
-                o.chunkSize = o.blob.size;
-                // Expose the chunk bytes position range:
-                o.contentRange = 'bytes ' + ub + '-' +
-                    (ub + o.chunkSize - 1) + '/' + fs;
-                // Process the upload data (the blob and potential form data):
-                that._initXHRData(o);
-                // Add progress listeners for this chunk upload:
-                that._initProgressListener(o);
-                jqXHR = ((that._trigger('chunksend', null, o) !== false && $.ajax(o)) ||
-                        that._getXHRPromise(false, o.context))
-                    .done(function (result, textStatus, jqXHR) {
-                        ub = that._getUploadedBytes(jqXHR) ||
-                            (ub + o.chunkSize);
-                        // Create a progress event if no final progress event
-                        // with loaded equaling total has been triggered
-                        // for this chunk:
-                        if (currentLoaded + o.chunkSize - o._progress.loaded) {
-                            that._onProgress($.Event('progress', {
-                                lengthComputable: true,
-                                loaded: ub - o.uploadedBytes,
-                                total: ub - o.uploadedBytes
-                            }), o);
-                        }
-                        options.uploadedBytes = o.uploadedBytes = ub;
-                        o.result = result;
-                        o.textStatus = textStatus;
-                        o.jqXHR = jqXHR;
-                        that._trigger('chunkdone', null, o);
-                        that._trigger('chunkalways', null, o);
-                        if (ub < fs) {
-                            // File upload not yet complete,
-                            // continue with the next chunk:
-                            upload();
-                        } else {
-                            dfd.resolveWith(
-                                o.context,
-                                [result, textStatus, jqXHR]
-                            );
-                        }
-                    })
-                    .fail(function (jqXHR, textStatus, errorThrown) {
-                        o.jqXHR = jqXHR;
-                        o.textStatus = textStatus;
-                        o.errorThrown = errorThrown;
-                        that._trigger('chunkfail', null, o);
-                        that._trigger('chunkalways', null, o);
-                        dfd.rejectWith(
-                            o.context,
-                            [jqXHR, textStatus, errorThrown]
-                        );
-                    });
-            };
-            this._enhancePromise(promise);
-            promise.abort = function () {
-                return jqXHR.abort();
-            };
-            upload();
-            return promise;
-        },
-
-        _beforeSend: function (e, data) {
-            if (this._active === 0) {
-                // the start callback is triggered when an upload starts
-                // and no other uploads are currently running,
-                // equivalent to the global ajaxStart event:
-                this._trigger('start');
-                // Set timer for global bitrate progress calculation:
-                this._bitrateTimer = new this._BitrateTimer();
-                // Reset the global progress values:
-                this._progress.loaded = this._progress.total = 0;
-                this._progress.bitrate = 0;
-            }
-            // Make sure the container objects for the .response() and
-            // .progress() methods on the data object are available
-            // and reset to their initial state:
-            this._initResponseObject(data);
-            this._initProgressObject(data);
-            data._progress.loaded = data.loaded = data.uploadedBytes || 0;
-            data._progress.total = data.total = this._getTotal(data.files) || 1;
-            data._progress.bitrate = data.bitrate = 0;
-            this._active += 1;
-            // Initialize the global progress values:
-            this._progress.loaded += data.loaded;
-            this._progress.total += data.total;
-        },
-
-        _onDone: function (result, textStatus, jqXHR, options) {
-            var total = options._progress.total,
-                response = options._response;
-            if (options._progress.loaded < total) {
-                // Create a progress event if no final progress event
-                // with loaded equaling total has been triggered:
-                this._onProgress($.Event('progress', {
-                    lengthComputable: true,
-                    loaded: total,
-                    total: total
-                }), options);
-            }
-            response.result = options.result = result;
-            response.textStatus = options.textStatus = textStatus;
-            response.jqXHR = options.jqXHR = jqXHR;
-            this._trigger('done', null, options);
-        },
-
-        _onFail: function (jqXHR, textStatus, errorThrown, options) {
-            var response = options._response;
-            if (options.recalculateProgress) {
-                // Remove the failed (error or abort) file upload from
-                // the global progress calculation:
-                this._progress.loaded -= options._progress.loaded;
-                this._progress.total -= options._progress.total;
-            }
-            response.jqXHR = options.jqXHR = jqXHR;
-            response.textStatus = options.textStatus = textStatus;
-            response.errorThrown = options.errorThrown = errorThrown;
-            this._trigger('fail', null, options);
-        },
-
-        _onAlways: function (jqXHRorResult, textStatus, jqXHRorError, options) {
-            // jqXHRorResult, textStatus and jqXHRorError are added to the
-            // options object via done and fail callbacks
-            this._trigger('always', null, options);
-        },
-
-        _onSend: function (e, data) {
-            if (!data.submit) {
-                this._addConvenienceMethods(e, data);
-            }
-            var that = this,
-                jqXHR,
-                aborted,
-                slot,
-                pipe,
-                options = that._getAJAXSettings(data),
-                send = function () {
-                    that._sending += 1;
-                    // Set timer for bitrate progress calculation:
-                    options._bitrateTimer = new that._BitrateTimer();
-                    jqXHR = jqXHR || (
-                        ((aborted || that._trigger(
-                            'send',
-                            $.Event('send', {delegatedEvent: e}),
-                            options
-                        ) === false) &&
-                        that._getXHRPromise(false, options.context, aborted)) ||
-                        that._chunkedUpload(options) || $.ajax(options)
-                    ).done(function (result, textStatus, jqXHR) {
-                        that._onDone(result, textStatus, jqXHR, options);
-                    }).fail(function (jqXHR, textStatus, errorThrown) {
-                        that._onFail(jqXHR, textStatus, errorThrown, options);
-                    }).always(function (jqXHRorResult, textStatus, jqXHRorError) {
-                        that._onAlways(
-                            jqXHRorResult,
-                            textStatus,
-                            jqXHRorError,
-                            options
-                        );
-                        that._sending -= 1;
-                        that._active -= 1;
-                        if (options.limitConcurrentUploads &&
-                                options.limitConcurrentUploads > that._sending) {
-                            // Start the next queued upload,
-                            // that has not been aborted:
-                            var nextSlot = that._slots.shift();
-                            while (nextSlot) {
-                                if (that._getDeferredState(nextSlot) === 'pending') {
-                                    nextSlot.resolve();
-                                    break;
-                                }
-                                nextSlot = that._slots.shift();
-                            }
-                        }
-                        if (that._active === 0) {
-                            // The stop callback is triggered when all uploads have
-                            // been completed, equivalent to the global ajaxStop event:
-                            that._trigger('stop');
-                        }
-                    });
-                    return jqXHR;
-                };
-            this._beforeSend(e, options);
-            if (this.options.sequentialUploads ||
-                    (this.options.limitConcurrentUploads &&
-                    this.options.limitConcurrentUploads <= this._sending)) {
-                if (this.options.limitConcurrentUploads > 1) {
-                    slot = $.Deferred();
-                    this._slots.push(slot);
-                    pipe = slot.pipe(send);
-                } else {
-                    this._sequence = this._sequence.pipe(send, send);
-                    pipe = this._sequence;
-                }
-                // Return the piped Promise object, enhanced with an abort method,
-                // which is delegated to the jqXHR object of the current upload,
-                // and jqXHR callbacks mapped to the equivalent Promise methods:
-                pipe.abort = function () {
-                    aborted = [undefined, 'abort', 'abort'];
-                    if (!jqXHR) {
-                        if (slot) {
-                            slot.rejectWith(options.context, aborted);
-                        }
-                        return send();
-                    }
-                    return jqXHR.abort();
-                };
-                return this._enhancePromise(pipe);
-            }
-            return send();
-        },
-
-        _onAdd: function (e, data) {
-            var that = this,
-                result = true,
-                options = $.extend({}, this.options, data),
-                files = data.files,
-                filesLength = files.length,
-                limit = options.limitMultiFileUploads,
-                limitSize = options.limitMultiFileUploadSize,
-                overhead = options.limitMultiFileUploadSizeOverhead,
-                batchSize = 0,
-                paramName = this._getParamName(options),
-                paramNameSet,
-                paramNameSlice,
-                fileSet,
-                i,
-                j = 0;
-            if (!filesLength) {
-                return false;
-            }
-            if (limitSize && files[0].size === undefined) {
-                limitSize = undefined;
-            }
-            if (!(options.singleFileUploads || limit || limitSize) ||
-                    !this._isXHRUpload(options)) {
-                fileSet = [files];
-                paramNameSet = [paramName];
-            } else if (!(options.singleFileUploads || limitSize) && limit) {
-                fileSet = [];
-                paramNameSet = [];
-                for (i = 0; i < filesLength; i += limit) {
-                    fileSet.push(files.slice(i, i + limit));
-                    paramNameSlice = paramName.slice(i, i + limit);
-                    if (!paramNameSlice.length) {
-                        paramNameSlice = paramName;
-                    }
-                    paramNameSet.push(paramNameSlice);
-                }
-            } else if (!options.singleFileUploads && limitSize) {
-                fileSet = [];
-                paramNameSet = [];
-                for (i = 0; i < filesLength; i = i + 1) {
-                    batchSize += files[i].size + overhead;
-                    if (i + 1 === filesLength ||
-                            ((batchSize + files[i + 1].size + overhead) > limitSize) ||
-                            (limit && i + 1 - j >= limit)) {
-                        fileSet.push(files.slice(j, i + 1));
-                        paramNameSlice = paramName.slice(j, i + 1);
-                        if (!paramNameSlice.length) {
-                            paramNameSlice = paramName;
-                        }
-                        paramNameSet.push(paramNameSlice);
-                        j = i + 1;
-                        batchSize = 0;
-                    }
-                }
-            } else {
-                paramNameSet = paramName;
-            }
-            data.originalFiles = files;
-            $.each(fileSet || files, function (index, element) {
-                var newData = $.extend({}, data);
-                newData.files = fileSet ? element : [element];
-                newData.paramName = paramNameSet[index];
-                that._initResponseObject(newData);
-                that._initProgressObject(newData);
-                that._addConvenienceMethods(e, newData);
-                result = that._trigger(
-                    'add',
-                    $.Event('add', {delegatedEvent: e}),
-                    newData
-                );
-                return result;
-            });
-            return result;
-        },
-
-        _replaceFileInput: function (data) {
-            var input = data.fileInput,
-                inputClone = input.clone(true),
-                restoreFocus = input.is(document.activeElement);
-            // Add a reference for the new cloned file input to the data argument:
-            data.fileInputClone = inputClone;
-            $('<form></form>').append(inputClone)[0].reset();
-            // Detaching allows to insert the fileInput on another form
-            // without loosing the file input value:
-            input.after(inputClone).detach();
-            // If the fileInput had focus before it was detached,
-            // restore focus to the inputClone.
-            if (restoreFocus) {
-                inputClone.focus();
-            }
-            // Avoid memory leaks with the detached file input:
-            $.cleanData(input.unbind('remove'));
-            // Replace the original file input element in the fileInput
-            // elements set with the clone, which has been copied including
-            // event handlers:
-            this.options.fileInput = this.options.fileInput.map(function (i, el) {
-                if (el === input[0]) {
-                    return inputClone[0];
-                }
-                return el;
-            });
-            // If the widget has been initialized on the file input itself,
-            // override this.element with the file input clone:
-            if (input[0] === this.element[0]) {
-                this.element = inputClone;
-            }
-        },
-
-        _handleFileTreeEntry: function (entry, path) {
-            var that = this,
-                dfd = $.Deferred(),
-                errorHandler = function (e) {
-                    if (e && !e.entry) {
-                        e.entry = entry;
-                    }
-                    // Since $.when returns immediately if one
-                    // Deferred is rejected, we use resolve instead.
-                    // This allows valid files and invalid items
-                    // to be returned together in one set:
-                    dfd.resolve([e]);
-                },
-                successHandler = function (entries) {
-                    that._handleFileTreeEntries(
-                        entries,
-                        path + entry.name + '/'
-                    ).done(function (files) {
-                        dfd.resolve(files);
-                    }).fail(errorHandler);
-                },
-                readEntries = function () {
-                    dirReader.readEntries(function (results) {
-                        if (!results.length) {
-                            successHandler(entries);
-                        } else {
-                            entries = entries.concat(results);
-                            readEntries();
-                        }
-                    }, errorHandler);
-                },
-                dirReader, entries = [];
-            path = path || '';
-            if (entry.isFile) {
-                if (entry._file) {
-                    // Workaround for Chrome bug #149735
-                    entry._file.relativePath = path;
-                    dfd.resolve(entry._file);
-                } else {
-                    entry.file(function (file) {
-                        file.relativePath = path;
-                        dfd.resolve(file);
-                    }, errorHandler);
-                }
-            } else if (entry.isDirectory) {
-                dirReader = entry.createReader();
-                readEntries();
-            } else {
-                // Return an empy list for file system items
-                // other than files or directories:
-                dfd.resolve([]);
-            }
-            return dfd.promise();
-        },
-
-        _handleFileTreeEntries: function (entries, path) {
-            var that = this;
-            return $.when.apply(
-                $,
-                $.map(entries, function (entry) {
-                    return that._handleFileTreeEntry(entry, path);
-                })
-            ).pipe(function () {
-                return Array.prototype.concat.apply(
-                    [],
-                    arguments
-                );
-            });
-        },
-
-        _getDroppedFiles: function (dataTransfer) {
-            dataTransfer = dataTransfer || {};
-            var items = dataTransfer.items;
-            if (items && items.length && (items[0].webkitGetAsEntry ||
-                    items[0].getAsEntry)) {
-                return this._handleFileTreeEntries(
-                    $.map(items, function (item) {
-                        var entry;
-                        if (item.webkitGetAsEntry) {
-                            entry = item.webkitGetAsEntry();
-                            if (entry) {
-                                // Workaround for Chrome bug #149735:
-                                entry._file = item.getAsFile();
-                            }
-                            return entry;
-                        }
-                        return item.getAsEntry();
-                    })
-                );
-            }
-            return $.Deferred().resolve(
-                $.makeArray(dataTransfer.files)
-            ).promise();
-        },
-
-        _getSingleFileInputFiles: function (fileInput) {
-            fileInput = $(fileInput);
-            var entries = fileInput.prop('webkitEntries') ||
-                    fileInput.prop('entries'),
-                files,
-                value;
-            if (entries && entries.length) {
-                return this._handleFileTreeEntries(entries);
-            }
-            files = $.makeArray(fileInput.prop('files'));
-            if (!files.length) {
-                value = fileInput.prop('value');
-                if (!value) {
-                    return $.Deferred().resolve([]).promise();
-                }
-                // If the files property is not available, the browser does not
-                // support the File API and we add a pseudo File object with
-                // the input value as name with path information removed:
-                files = [{name: value.replace(/^.*\\/, '')}];
-            } else if (files[0].name === undefined && files[0].fileName) {
-                // File normalization for Safari 4 and Firefox 3:
-                $.each(files, function (index, file) {
-                    file.name = file.fileName;
-                    file.size = file.fileSize;
-                });
-            }
-            return $.Deferred().resolve(files).promise();
-        },
-
-        _getFileInputFiles: function (fileInput) {
-            if (!(fileInput instanceof $) || fileInput.length === 1) {
-                return this._getSingleFileInputFiles(fileInput);
-            }
-            return $.when.apply(
-                $,
-                $.map(fileInput, this._getSingleFileInputFiles)
-            ).pipe(function () {
-                return Array.prototype.concat.apply(
-                    [],
-                    arguments
-                );
-            });
-        },
-
-        _onChange: function (e) {
-            var that = this,
-                data = {
-                    fileInput: $(e.target),
-                    form: $(e.target.form)
-                };
-            this._getFileInputFiles(data.fileInput).always(function (files) {
-                data.files = files;
-                if (that.options.replaceFileInput) {
-                    that._replaceFileInput(data);
-                }
-                if (that._trigger(
-                        'change',
-                        $.Event('change', {delegatedEvent: e}),
-                        data
-                    ) !== false) {
-                    that._onAdd(e, data);
-                }
-            });
-        },
-
-        _onPaste: function (e) {
-            var items = e.originalEvent && e.originalEvent.clipboardData &&
-                    e.originalEvent.clipboardData.items,
-                data = {files: []};
-            if (items && items.length) {
-                $.each(items, function (index, item) {
-                    var file = item.getAsFile && item.getAsFile();
-                    if (file) {
-                        data.files.push(file);
-                    }
-                });
-                if (this._trigger(
-                        'paste',
-                        $.Event('paste', {delegatedEvent: e}),
-                        data
-                    ) !== false) {
-                    this._onAdd(e, data);
-                }
-            }
-        },
-
-        _onDrop: function (e) {
-            e.dataTransfer = e.originalEvent && e.originalEvent.dataTransfer;
-            var that = this,
-                dataTransfer = e.dataTransfer,
-                data = {};
-            if (dataTransfer && dataTransfer.files && dataTransfer.files.length) {
-                e.preventDefault();
-                this._getDroppedFiles(dataTransfer).always(function (files) {
-                    data.files = files;
-                    if (that._trigger(
-                            'drop',
-                            $.Event('drop', {delegatedEvent: e}),
-                            data
-                        ) !== false) {
-                        that._onAdd(e, data);
-                    }
-                });
-            }
-        },
-
-        _onDragOver: getDragHandler('dragover'),
-
-        _onDragEnter: getDragHandler('dragenter'),
-
-        _onDragLeave: getDragHandler('dragleave'),
-
-        _initEventHandlers: function () {
-            if (this._isXHRUpload(this.options)) {
-                this._on(this.options.dropZone, {
-                    dragover: this._onDragOver,
-                    drop: this._onDrop,
-                    // event.preventDefault() on dragenter is required for IE10+:
-                    dragenter: this._onDragEnter,
-                    // dragleave is not required, but added for completeness:
-                    dragleave: this._onDragLeave
-                });
-                this._on(this.options.pasteZone, {
-                    paste: this._onPaste
-                });
-            }
-            if ($.support.fileInput) {
-                this._on(this.options.fileInput, {
-                    change: this._onChange
-                });
-            }
-        },
-
-        _destroyEventHandlers: function () {
-            this._off(this.options.dropZone, 'dragenter dragleave dragover drop');
-            this._off(this.options.pasteZone, 'paste');
-            this._off(this.options.fileInput, 'change');
-        },
-
-        _setOption: function (key, value) {
-            var reinit = $.inArray(key, this._specialOptions) !== -1;
-            if (reinit) {
-                this._destroyEventHandlers();
-            }
-            this._super(key, value);
-            if (reinit) {
-                this._initSpecialOptions();
-                this._initEventHandlers();
-            }
-        },
-
-        _initSpecialOptions: function () {
-            var options = this.options;
-            if (options.fileInput === undefined) {
-                options.fileInput = this.element.is('input[type="file"]') ?
-                        this.element : this.element.find('input[type="file"]');
-            } else if (!(options.fileInput instanceof $)) {
-                options.fileInput = $(options.fileInput);
-            }
-            if (!(options.dropZone instanceof $)) {
-                options.dropZone = $(options.dropZone);
-            }
-            if (!(options.pasteZone instanceof $)) {
-                options.pasteZone = $(options.pasteZone);
-            }
-        },
-
-        _getRegExp: function (str) {
-            var parts = str.split('/'),
-                modifiers = parts.pop();
-            parts.shift();
-            return new RegExp(parts.join('/'), modifiers);
-        },
-
-        _isRegExpOption: function (key, value) {
-            return key !== 'url' && $.type(value) === 'string' &&
-                /^\/.*\/[igm]{0,3}$/.test(value);
-        },
-
-        _initDataAttributes: function () {
-            var that = this,
-                options = this.options,
-                data = this.element.data();
-            // Initialize options set via HTML5 data-attributes:
-            $.each(
-                this.element[0].attributes,
-                function (index, attr) {
-                    var key = attr.name.toLowerCase(),
-                        value;
-                    if (/^data-/.test(key)) {
-                        // Convert hyphen-ated key to camelCase:
-                        key = key.slice(5).replace(/-[a-z]/g, function (str) {
-                            return str.charAt(1).toUpperCase();
-                        });
-                        value = data[key];
-                        if (that._isRegExpOption(key, value)) {
-                            value = that._getRegExp(value);
-                        }
-                        options[key] = value;
-                    }
-                }
-            );
-        },
-
-        _create: function () {
-            this._initDataAttributes();
-            this._initSpecialOptions();
-            this._slots = [];
-            this._sequence = this._getXHRPromise(true);
-            this._sending = this._active = 0;
-            this._initProgressObject(this);
-            this._initEventHandlers();
-        },
-
-        // This method is exposed to the widget API and allows to query
-        // the number of active uploads:
-        active: function () {
-            return this._active;
-        },
-
-        // This method is exposed to the widget API and allows to query
-        // the widget upload progress.
-        // It returns an object with loaded, total and bitrate properties
-        // for the running uploads:
-        progress: function () {
-            return this._progress;
-        },
-
-        // This method is exposed to the widget API and allows adding files
-        // using the fileupload API. The data parameter accepts an object which
-        // must have a files property and can contain additional options:
-        // .fileupload('add', {files: filesList});
-        add: function (data) {
-            var that = this;
-            if (!data || this.options.disabled) {
-                return;
-            }
-            if (data.fileInput && !data.files) {
-                this._getFileInputFiles(data.fileInput).always(function (files) {
-                    data.files = files;
-                    that._onAdd(null, data);
-                });
-            } else {
-                data.files = $.makeArray(data.files);
-                this._onAdd(null, data);
-            }
-        },
-
-        // This method is exposed to the widget API and allows sending files
-        // using the fileupload API. The data parameter accepts an object which
-        // must have a files or fileInput property and can contain additional options:
-        // .fileupload('send', {files: filesList});
-        // The method returns a Promise object for the file upload call.
-        send: function (data) {
-            if (data && !this.options.disabled) {
-                if (data.fileInput && !data.files) {
-                    var that = this,
-                        dfd = $.Deferred(),
-                        promise = dfd.promise(),
-                        jqXHR,
-                        aborted;
-                    promise.abort = function () {
-                        aborted = true;
-                        if (jqXHR) {
-                            return jqXHR.abort();
-                        }
-                        dfd.reject(null, 'abort', 'abort');
-                        return promise;
-                    };
-                    this._getFileInputFiles(data.fileInput).always(
-                        function (files) {
-                            if (aborted) {
-                                return;
-                            }
-                            if (!files.length) {
-                                dfd.reject();
-                                return;
-                            }
-                            data.files = files;
-                            jqXHR = that._onSend(null, data);
-                            jqXHR.then(
-                                function (result, textStatus, jqXHR) {
-                                    dfd.resolve(result, textStatus, jqXHR);
-                                },
-                                function (jqXHR, textStatus, errorThrown) {
-                                    dfd.reject(jqXHR, textStatus, errorThrown);
-                                }
-                            );
-                        }
-                    );
-                    return this._enhancePromise(promise);
-                }
-                data.files = $.makeArray(data.files);
-                if (data.files.length) {
-                    return this._onSend(null, data);
-                }
-            }
-            return this._getXHRPromise(false, data && data.context);
-        }
-
-    });
-
-}));
diff --git a/vendor/assets/javascripts/fileupload/jquery.iframe-transport.js b/vendor/assets/javascripts/fileupload/jquery.iframe-transport.js
deleted file mode 100644
index af7ce915dc..0000000000
--- a/vendor/assets/javascripts/fileupload/jquery.iframe-transport.js
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * jQuery Iframe Transport Plugin
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2011, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/* global define, require, window, document */
-
-(function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define(['jquery'], factory);
-    } else if (typeof exports === 'object') {
-        // Node/CommonJS:
-        factory(require('jquery'));
-    } else {
-        // Browser globals:
-        factory(window.jQuery);
-    }
-}(function ($) {
-    'use strict';
-
-    // Helper variable to create unique names for the transport iframes:
-    var counter = 0;
-
-    // The iframe transport accepts four additional options:
-    // options.fileInput: a jQuery collection of file input fields
-    // options.paramName: the parameter name for the file form data,
-    //  overrides the name property of the file input field(s),
-    //  can be a string or an array of strings.
-    // options.formData: an array of objects with name and value properties,
-    //  equivalent to the return data of .serializeArray(), e.g.:
-    //  [{name: 'a', value: 1}, {name: 'b', value: 2}]
-    // options.initialIframeSrc: the URL of the initial iframe src,
-    //  by default set to "javascript:false;"
-    $.ajaxTransport('iframe', function (options) {
-        if (options.async) {
-            // javascript:false as initial iframe src
-            // prevents warning popups on HTTPS in IE6:
-            /*jshint scripturl: true */
-            var initialIframeSrc = options.initialIframeSrc || 'javascript:false;',
-            /*jshint scripturl: false */
-                form,
-                iframe,
-                addParamChar;
-            return {
-                send: function (_, completeCallback) {
-                    form = $('<form style="display:none;"></form>');
-                    form.attr('accept-charset', options.formAcceptCharset);
-                    addParamChar = /\?/.test(options.url) ? '&' : '?';
-                    // XDomainRequest only supports GET and POST:
-                    if (options.type === 'DELETE') {
-                        options.url = options.url + addParamChar + '_method=DELETE';
-                        options.type = 'POST';
-                    } else if (options.type === 'PUT') {
-                        options.url = options.url + addParamChar + '_method=PUT';
-                        options.type = 'POST';
-                    } else if (options.type === 'PATCH') {
-                        options.url = options.url + addParamChar + '_method=PATCH';
-                        options.type = 'POST';
-                    }
-                    // IE versions below IE8 cannot set the name property of
-                    // elements that have already been added to the DOM,
-                    // so we set the name along with the iframe HTML markup:
-                    counter += 1;
-                    iframe = $(
-                        '<iframe src="' + initialIframeSrc +
-                            '" name="iframe-transport-' + counter + '"></iframe>'
-                    ).bind('load', function () {
-                        var fileInputClones,
-                            paramNames = Array.isArray(options.paramName) ?
-                                    options.paramName : [options.paramName];
-                        iframe
-                            .unbind('load')
-                            .bind('load', function () {
-                                var response;
-                                // Wrap in a try/catch block to catch exceptions thrown
-                                // when trying to access cross-domain iframe contents:
-                                try {
-                                    response = iframe.contents();
-                                    // Google Chrome and Firefox do not throw an
-                                    // exception when calling iframe.contents() on
-                                    // cross-domain requests, so we unify the response:
-                                    if (!response.length || !response[0].firstChild) {
-                                        throw new Error();
-                                    }
-                                } catch (e) {
-                                    response = undefined;
-                                }
-                                // The complete callback returns the
-                                // iframe content document as response object:
-                                completeCallback(
-                                    200,
-                                    'success',
-                                    {'iframe': response}
-                                );
-                                // Fix for IE endless progress bar activity bug
-                                // (happens on form submits to iframe targets):
-                                $('<iframe src="' + initialIframeSrc + '"></iframe>')
-                                    .appendTo(form);
-                                window.setTimeout(function () {
-                                    // Removing the form in a setTimeout call
-                                    // allows Chrome's developer tools to display
-                                    // the response result
-                                    form.remove();
-                                }, 0);
-                            });
-                        form
-                            .prop('target', iframe.prop('name'))
-                            .prop('action', options.url)
-                            .prop('method', options.type);
-                        if (options.formData) {
-                            $.each(options.formData, function (index, field) {
-                                $('<input type="hidden"/>')
-                                    .prop('name', field.name)
-                                    .val(field.value)
-                                    .appendTo(form);
-                            });
-                        }
-                        if (options.fileInput && options.fileInput.length &&
-                                options.type === 'POST') {
-                            fileInputClones = options.fileInput.clone();
-                            // Insert a clone for each file input field:
-                            options.fileInput.after(function (index) {
-                                return fileInputClones[index];
-                            });
-                            if (options.paramName) {
-                                options.fileInput.each(function (index) {
-                                    $(this).prop(
-                                        'name',
-                                        paramNames[index] || options.paramName
-                                    );
-                                });
-                            }
-                            // Appending the file input fields to the hidden form
-                            // removes them from their original location:
-                            form
-                                .append(options.fileInput)
-                                .prop('enctype', 'multipart/form-data')
-                                // enctype must be set as encoding for IE:
-                                .prop('encoding', 'multipart/form-data');
-                            // Remove the HTML5 form attribute from the input(s):
-                            options.fileInput.removeAttr('form');
-                        }
-                        form.submit();
-                        // Insert the file input fields at their original location
-                        // by replacing the clones with the originals:
-                        if (fileInputClones && fileInputClones.length) {
-                            options.fileInput.each(function (index, input) {
-                                var clone = $(fileInputClones[index]);
-                                // Restore the original name and form properties:
-                                $(input)
-                                    .prop('name', clone.prop('name'))
-                                    .attr('form', clone.attr('form'));
-                                clone.replaceWith(input);
-                            });
-                        }
-                    });
-                    form.append(iframe).appendTo(document.body);
-                },
-                abort: function () {
-                    if (iframe) {
-                        // javascript:false as iframe src aborts the request
-                        // and prevents warning popups on HTTPS in IE6.
-                        // concat is used to avoid the "Script URL" JSLint error:
-                        iframe
-                            .unbind('load')
-                            .prop('src', initialIframeSrc);
-                    }
-                    if (form) {
-                        form.remove();
-                    }
-                }
-            };
-        }
-    });
-
-    // The iframe transport returns the iframe content document as response.
-    // The following adds converters from iframe to text, json, html, xml
-    // and script.
-    // Please note that the Content-Type for JSON responses has to be text/plain
-    // or text/html, if the browser doesn't include application/json in the
-    // Accept header, else IE will show a download dialog.
-    // The Content-Type for XML responses on the other hand has to be always
-    // application/xml or text/xml, so IE properly parses the XML response.
-    // See also
-    // https://github.com/blueimp/jQuery-File-Upload/wiki/Setup#content-type-negotiation
-    $.ajaxSetup({
-        converters: {
-            'iframe text': function (iframe) {
-                return iframe && $(iframe[0].body).text();
-            },
-            'iframe json': function (iframe) {
-                return iframe && $.parseJSON($(iframe[0].body).text());
-            },
-            'iframe html': function (iframe) {
-                return iframe && $(iframe[0].body).html();
-            },
-            'iframe xml': function (iframe) {
-                var xmlDoc = iframe && iframe[0];
-                return xmlDoc && $.isXMLDoc(xmlDoc) ? xmlDoc :
-                        $.parseXML((xmlDoc.XMLDocument && xmlDoc.XMLDocument.xml) ||
-                            $(xmlDoc.body).html());
-            },
-            'iframe script': function (iframe) {
-                return iframe && $.globalEval($(iframe[0].body).text());
-            }
-        }
-    });
-
-}));