From ef0f708f8ff97bef3e7d3794fc34f7f27ba70db6 Mon Sep 17 00:00:00 2001
From: Dmytro Sadovnychyi <git@dmit.ro>
Date: Sat, 11 Nov 2017 18:12:46 +0800
Subject: [PATCH 01/54] Allow to select multiple files at once from remote
 providers

---
 src/core/Core.js                       |  1 +
 src/generic-provider-views/Browser.js  |  4 +++-
 src/generic-provider-views/Table.js    |  6 ++++++
 src/generic-provider-views/TableRow.js | 12 ++++++++++++
 src/generic-provider-views/index.js    | 24 +++++++++++++++++++++++-
 src/plugins/Dashboard/index.js         | 10 ++++++----
 src/scss/_provider.scss                |  4 ++++
 7 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/src/core/Core.js b/src/core/Core.js
index e0520931c..e4feacb67 100644
--- a/src/core/Core.js
+++ b/src/core/Core.js
@@ -338,6 +338,7 @@ class Uppy {
           },
           size: file.data.size || 'N/A',
           isRemote: isRemote,
+          isCheckbox: file.isCheckbox,
           remote: file.remote || '',
           preview: file.preview
         }
diff --git a/src/generic-provider-views/Browser.js b/src/generic-provider-views/Browser.js
index bd1bce04d..131a33f3b 100644
--- a/src/generic-provider-views/Browser.js
+++ b/src/generic-provider-views/Browser.js
@@ -17,7 +17,7 @@ module.exports = (props) => {
         <div class="Browser-search" aria-hidden="${!props.isSearchVisible}">
           <input type="text" class="Browser-searchInput" placeholder="Search"
                  onkeyup=${props.filterQuery} value="${props.filterInput}"/>
-          <button type="button" class="Browser-searchClose" 
+          <button type="button" class="Browser-searchClose"
                   onclick=${props.toggleSearch}>
             <svg class="UppyIcon" viewBox="0 0 19 19">
               <path d="M17.318 17.232L9.94 9.854 9.586 9.5l-.354.354-7.378 7.378h.707l-.62-.62v.706L9.318 9.94l.354-.354-.354-.354L1.94 1.854v.707l.62-.62h-.706l7.378 7.378.354.354.354-.354 7.378-7.378h-.707l.622.62v-.706L9.854 9.232l-.354.354.354.354 7.378 7.378.708-.707-7.38-7.378v.708l7.38-7.38.353-.353-.353-.353-.622-.622-.353-.353-.354.352-7.378 7.38h.708L2.56 1.23 2.208.88l-.353.353-.622.62-.353.355.352.353 7.38 7.38v-.708l-7.38 7.38-.353.353.352.353.622.622.353.353.354-.353 7.38-7.38h-.708l7.38 7.38z"/>
@@ -52,6 +52,8 @@ module.exports = (props) => {
           sortByDate: props.sortByDate,
           handleFileClick: props.addFile,
           handleFolderClick: props.getNextFolder,
+          isChecked: props.isChecked,
+          removeFile: props.removeFile,
           getItemName: props.getItemName,
           getItemIcon: props.getItemIcon,
           handleScroll: props.handleScroll
diff --git a/src/generic-provider-views/Table.js b/src/generic-provider-views/Table.js
index c74cefd3c..2bf0aed06 100644
--- a/src/generic-provider-views/Table.js
+++ b/src/generic-provider-views/Table.js
@@ -23,6 +23,9 @@ module.exports = (props) => {
             active: props.activeRow(folder),
             getItemIcon: () => props.getItemIcon(folder),
             handleClick: () => props.handleFolderClick(folder),
+            isChecked: props.isChecked(folder),
+            removeFile: () => props.removeFile(folder),
+            handleCheckboxClick: () => props.handleFileClick(folder, true),
             columns: props.columns
           })
         })}
@@ -32,6 +35,9 @@ module.exports = (props) => {
             active: props.activeRow(file),
             getItemIcon: () => props.getItemIcon(file),
             handleClick: () => props.handleFileClick(file),
+            isChecked: props.isChecked(file),
+            removeFile: () => props.removeFile(file),
+            handleCheckboxClick: () => props.handleFileClick(file, true),
             columns: props.columns
           })
         })}
diff --git a/src/generic-provider-views/TableRow.js b/src/generic-provider-views/TableRow.js
index b123e82cc..0b846ef4f 100644
--- a/src/generic-provider-views/TableRow.js
+++ b/src/generic-provider-views/TableRow.js
@@ -1,10 +1,22 @@
 const html = require('yo-yo')
 const Column = require('./TableColumn')
 
+const toggleCheckbox = (e, props) => {
+  e.stopPropagation()
+  if (props.isChecked) {
+    props.removeFile()
+  } else {
+    props.handleCheckboxClick(e)
+  }
+}
+
 module.exports = (props) => {
   const classes = props.active ? 'BrowserTable-row is-active' : 'BrowserTable-row'
   return html`
     <tr onclick=${props.handleClick} class=${classes}>
+      <td onclick=${(e) => toggleCheckbox(e, props)} class="BrowserTable-column">
+        <input type="checkbox" checked=${props.isChecked} />
+      </td>
       ${Column({
         getItemIcon: props.getItemIcon,
         value: props.title
diff --git a/src/generic-provider-views/index.js b/src/generic-provider-views/index.js
index f5c0de99f..4cd38702e 100644
--- a/src/generic-provider-views/index.js
+++ b/src/generic-provider-views/index.js
@@ -66,6 +66,8 @@ module.exports = class View {
     this.sortByTitle = this.sortByTitle.bind(this)
     this.sortByDate = this.sortByDate.bind(this)
     this.isActiveRow = this.isActiveRow.bind(this)
+    this.isChecked = this.isChecked.bind(this)
+    this.removeFile = this.removeFile.bind(this)
     this.handleError = this.handleError.bind(this)
     this.handleScroll = this.handleScroll.bind(this)
 
@@ -146,13 +148,14 @@ module.exports = class View {
     this.getFolder(id, this.plugin.getItemName(folder))
   }
 
-  addFile (file) {
+  addFile (file, isCheckbox=false) {
     const tagFile = {
       source: this.plugin.id,
       data: this.plugin.getItemData(file),
       name: this.plugin.getItemName(file) || this.plugin.getItemId(file),
       type: this.plugin.getMimeType(file),
       isRemote: true,
+      isCheckbox: isCheckbox,
       body: {
         fileId: this.plugin.getItemId(file)
       },
@@ -308,6 +311,23 @@ module.exports = class View {
     return this.plugin.core.getState()[this.plugin.stateId].activeRow === this.plugin.getItemId(file)
   }
 
+  isChecked (file) {
+    const fileId = Utils.generateFileID({
+      data: this.plugin.getItemData(file),
+      name: this.plugin.getItemName(file) || this.plugin.getItemId(file),
+      type: this.plugin.getMimeType(file),
+    })
+    return (fileId in this.plugin.core.getState().files)
+  }
+
+  removeFile (file) {
+    this.plugin.core.removeFile(Utils.generateFileID({
+      data: this.plugin.getItemData(file),
+      name: this.plugin.getItemName(file) || this.plugin.getItemId(file),
+      type: this.plugin.getMimeType(file),
+    }))
+  }
+
   handleDemoAuth () {
     const state = this.plugin.core.getState()[this.plugin.stateId]
     this.updateState({}, state, {
@@ -407,6 +427,8 @@ module.exports = class View {
       logout: this.logout,
       demo: this.plugin.opts.demo,
       isActiveRow: this.isActiveRow,
+      isChecked: this.isChecked,
+      removeFile: this.removeFile,
       getItemName: this.plugin.getItemName,
       getItemIcon: this.plugin.getItemIcon,
       handleScroll: this.handleScroll,
diff --git a/src/plugins/Dashboard/index.js b/src/plugins/Dashboard/index.js
index bbd94c524..2e013d65f 100644
--- a/src/plugins/Dashboard/index.js
+++ b/src/plugins/Dashboard/index.js
@@ -121,10 +121,12 @@ module.exports = class DashboardUI extends Plugin {
     return this.target
   }
 
-  hideAllPanels () {
-    this.setPluginState({
-      activePanel: false
-    })
+  hideAllPanels (file) {
+    if (!file.isCheckbox) {
+      this.setPluginState({
+        activePanel: false
+      })
+    }
   }
 
   showPanel (id) {
diff --git a/src/scss/_provider.scss b/src/scss/_provider.scss
index d13f53e73..b54fe5080 100644
--- a/src/scss/_provider.scss
+++ b/src/scss/_provider.scss
@@ -418,6 +418,10 @@
   margin-right: 3px;
 }
 
+.BrowserTable-column input {
+  margin-top: 0;
+}
+
 .BrowserTable-headerColumn {
   cursor: pointer;
   text-align: left;

From e976d1f711666d1c92132d0079d198bb7240dce4 Mon Sep 17 00:00:00 2001
From: Dmytro Sadovnychyi <git@dmit.ro>
Date: Sat, 11 Nov 2017 18:13:19 +0800
Subject: [PATCH 02/54] Fix for styleguide

---
 src/generic-provider-views/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/generic-provider-views/index.js b/src/generic-provider-views/index.js
index 4cd38702e..163ccf980 100644
--- a/src/generic-provider-views/index.js
+++ b/src/generic-provider-views/index.js
@@ -148,7 +148,7 @@ module.exports = class View {
     this.getFolder(id, this.plugin.getItemName(folder))
   }
 
-  addFile (file, isCheckbox=false) {
+  addFile (file, isCheckbox = false) {
     const tagFile = {
       source: this.plugin.id,
       data: this.plugin.getItemData(file),
@@ -315,7 +315,7 @@ module.exports = class View {
     const fileId = Utils.generateFileID({
       data: this.plugin.getItemData(file),
       name: this.plugin.getItemName(file) || this.plugin.getItemId(file),
-      type: this.plugin.getMimeType(file),
+      type: this.plugin.getMimeType(file)
     })
     return (fileId in this.plugin.core.getState().files)
   }
@@ -324,7 +324,7 @@ module.exports = class View {
     this.plugin.core.removeFile(Utils.generateFileID({
       data: this.plugin.getItemData(file),
       name: this.plugin.getItemName(file) || this.plugin.getItemId(file),
-      type: this.plugin.getMimeType(file),
+      type: this.plugin.getMimeType(file)
     }))
   }
 

From cca123b55edc309b00f3321e5b47a1d18cd4e38b Mon Sep 17 00:00:00 2001
From: Dmytro Sadovnychyi <git@dmit.ro>
Date: Sat, 11 Nov 2017 21:11:42 +0800
Subject: [PATCH 03/54] Allow to select multiple files using shift and click

---
 src/generic-provider-views/Browser.js  |  2 +-
 src/generic-provider-views/Table.js    |  6 +--
 src/generic-provider-views/TableRow.js | 11 +-----
 src/generic-provider-views/index.js    | 53 ++++++++++++++++++++------
 src/scss/_provider.scss                |  1 +
 5 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/src/generic-provider-views/Browser.js b/src/generic-provider-views/Browser.js
index 131a33f3b..72a4a4d87 100644
--- a/src/generic-provider-views/Browser.js
+++ b/src/generic-provider-views/Browser.js
@@ -53,7 +53,7 @@ module.exports = (props) => {
           handleFileClick: props.addFile,
           handleFolderClick: props.getNextFolder,
           isChecked: props.isChecked,
-          removeFile: props.removeFile,
+          toggleCheckbox: props.toggleCheckbox,
           getItemName: props.getItemName,
           getItemIcon: props.getItemIcon,
           handleScroll: props.handleScroll
diff --git a/src/generic-provider-views/Table.js b/src/generic-provider-views/Table.js
index 2bf0aed06..3e008c957 100644
--- a/src/generic-provider-views/Table.js
+++ b/src/generic-provider-views/Table.js
@@ -24,8 +24,7 @@ module.exports = (props) => {
             getItemIcon: () => props.getItemIcon(folder),
             handleClick: () => props.handleFolderClick(folder),
             isChecked: props.isChecked(folder),
-            removeFile: () => props.removeFile(folder),
-            handleCheckboxClick: () => props.handleFileClick(folder, true),
+            handleCheckboxClick: (e) => props.toggleCheckbox(e, folder),
             columns: props.columns
           })
         })}
@@ -36,8 +35,7 @@ module.exports = (props) => {
             getItemIcon: () => props.getItemIcon(file),
             handleClick: () => props.handleFileClick(file),
             isChecked: props.isChecked(file),
-            removeFile: () => props.removeFile(file),
-            handleCheckboxClick: () => props.handleFileClick(file, true),
+            handleCheckboxClick: (e) => props.toggleCheckbox(e, file),
             columns: props.columns
           })
         })}
diff --git a/src/generic-provider-views/TableRow.js b/src/generic-provider-views/TableRow.js
index 0b846ef4f..6630e95aa 100644
--- a/src/generic-provider-views/TableRow.js
+++ b/src/generic-provider-views/TableRow.js
@@ -1,20 +1,11 @@
 const html = require('yo-yo')
 const Column = require('./TableColumn')
 
-const toggleCheckbox = (e, props) => {
-  e.stopPropagation()
-  if (props.isChecked) {
-    props.removeFile()
-  } else {
-    props.handleCheckboxClick(e)
-  }
-}
-
 module.exports = (props) => {
   const classes = props.active ? 'BrowserTable-row is-active' : 'BrowserTable-row'
   return html`
     <tr onclick=${props.handleClick} class=${classes}>
-      <td onclick=${(e) => toggleCheckbox(e, props)} class="BrowserTable-column">
+      <td onclick=${props.handleCheckboxClick} class="BrowserTable-column">
         <input type="checkbox" checked=${props.isChecked} />
       </td>
       ${Column({
diff --git a/src/generic-provider-views/index.js b/src/generic-provider-views/index.js
index 163ccf980..96b726b32 100644
--- a/src/generic-provider-views/index.js
+++ b/src/generic-provider-views/index.js
@@ -67,7 +67,7 @@ module.exports = class View {
     this.sortByDate = this.sortByDate.bind(this)
     this.isActiveRow = this.isActiveRow.bind(this)
     this.isChecked = this.isChecked.bind(this)
-    this.removeFile = this.removeFile.bind(this)
+    this.toggleCheckbox = this.toggleCheckbox.bind(this)
     this.handleError = this.handleError.bind(this)
     this.handleScroll = this.handleScroll.bind(this)
 
@@ -146,6 +146,7 @@ module.exports = class View {
   getNextFolder (folder) {
     let id = this.plugin.getItemRequestPath(folder)
     this.getFolder(id, this.plugin.getItemName(folder))
+    this.lastCheckbox = undefined
   }
 
   addFile (file, isCheckbox = false) {
@@ -312,20 +313,48 @@ module.exports = class View {
   }
 
   isChecked (file) {
-    const fileId = Utils.generateFileID({
+    return (this.fileToId(file) in this.plugin.core.getState().files)
+  }
+
+  toggleCheckbox (e, file) {
+    e.stopPropagation()
+    e.preventDefault()
+    let {folders, files, filterInput} = this.plugin.core.getState()[this.plugin.stateId]
+    let items = folders.concat(files)
+    if (filterInput !== '') {
+      items = this.filterItems(items)
+    }
+    let itemsToToggle = [file]
+    if (this.lastCheckbox && e.shiftKey) {
+      let prevIndex = items.indexOf(this.lastCheckbox)
+      let currentIndex = items.indexOf(file)
+      if (prevIndex < currentIndex) {
+        itemsToToggle = items.slice(prevIndex, currentIndex + 1)
+      } else {
+        itemsToToggle = items.slice(currentIndex, prevIndex + 1)
+      }
+    }
+    this.lastCheckbox = file
+    if (this.isChecked(file)) {
+      for (let item of itemsToToggle) {
+        const itemId = this.fileToId(item)
+        if (itemId in this.plugin.core.getState().files) {
+          this.plugin.core.removeFile(itemId)
+        }
+      }
+    } else {
+      for (let item of itemsToToggle) {
+        this.addFile(item, true)
+      }
+    }
+  }
+
+  fileToId (file) {
+    return Utils.generateFileID({
       data: this.plugin.getItemData(file),
       name: this.plugin.getItemName(file) || this.plugin.getItemId(file),
       type: this.plugin.getMimeType(file)
     })
-    return (fileId in this.plugin.core.getState().files)
-  }
-
-  removeFile (file) {
-    this.plugin.core.removeFile(Utils.generateFileID({
-      data: this.plugin.getItemData(file),
-      name: this.plugin.getItemName(file) || this.plugin.getItemId(file),
-      type: this.plugin.getMimeType(file)
-    }))
   }
 
   handleDemoAuth () {
@@ -428,7 +457,7 @@ module.exports = class View {
       demo: this.plugin.opts.demo,
       isActiveRow: this.isActiveRow,
       isChecked: this.isChecked,
-      removeFile: this.removeFile,
+      toggleCheckbox: this.toggleCheckbox,
       getItemName: this.plugin.getItemName,
       getItemIcon: this.plugin.getItemIcon,
       handleScroll: this.handleScroll,
diff --git a/src/scss/_provider.scss b/src/scss/_provider.scss
index b54fe5080..3ff6b655f 100644
--- a/src/scss/_provider.scss
+++ b/src/scss/_provider.scss
@@ -420,6 +420,7 @@
 
 .BrowserTable-column input {
   margin-top: 0;
+  cursor: pointer;
 }
 
 .BrowserTable-headerColumn {

From 5e8d5cf11cf6972dba174c3a432cff818ed85f84 Mon Sep 17 00:00:00 2001
From: Dmytro Sadovnychyi <git@dmit.ro>
Date: Sun, 12 Nov 2017 16:12:11 +0800
Subject: [PATCH 04/54] Do not display NaN for folder sizes

---
 src/plugins/Dashboard/FileItem.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/Dashboard/FileItem.js b/src/plugins/Dashboard/FileItem.js
index 864f68293..528bd6d0f 100644
--- a/src/plugins/Dashboard/FileItem.js
+++ b/src/plugins/Dashboard/FileItem.js
@@ -99,7 +99,7 @@ module.exports = function fileItem (props) {
         }
       </h4>
       <div class="UppyDashboardItem-status">
-        ${file.data.size && html`<div class="UppyDashboardItem-statusSize">${prettyBytes(file.data.size)}</div>`}
+        ${isNaN(file.data.size) ? '' : html`<div class="UppyDashboardItem-statusSize">${prettyBytes(file.data.size)}</div>`}
         ${file.source && html`<div class="UppyDashboardItem-sourceIcon">
             ${acquirers.map(acquirer => {
               if (acquirer.id === file.source) return html`<span title="${props.i18n('fileSource')}: ${acquirer.name}">${acquirer.icon()}</span>`

From 0f12dc81877cae0e49d50975772e0695eb5fac50 Mon Sep 17 00:00:00 2001
From: Dmytro Sadovnychyi <git@dmit.ro>
Date: Sun, 12 Nov 2017 18:23:55 +0800
Subject: [PATCH 05/54] Add isFolder property for each file

---
 src/core/Core.js                    | 3 ++-
 src/generic-provider-views/index.js | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/Core.js b/src/core/Core.js
index e4feacb67..efe49864c 100644
--- a/src/core/Core.js
+++ b/src/core/Core.js
@@ -338,7 +338,8 @@ class Uppy {
           },
           size: file.data.size || 'N/A',
           isRemote: isRemote,
-          isCheckbox: file.isCheckbox,
+          isCheckbox: file.isCheckbox || false,
+          isFolder: file.isFolder || false,
           remote: file.remote || '',
           preview: file.preview
         }
diff --git a/src/generic-provider-views/index.js b/src/generic-provider-views/index.js
index 96b726b32..50e1d9784 100644
--- a/src/generic-provider-views/index.js
+++ b/src/generic-provider-views/index.js
@@ -157,6 +157,7 @@ module.exports = class View {
       type: this.plugin.getMimeType(file),
       isRemote: true,
       isCheckbox: isCheckbox,
+      isFolder: this.plugin.isFolder(file),
       body: {
         fileId: this.plugin.getItemId(file)
       },

From 2718837201e3654a4243bed358ffb341b544c733 Mon Sep 17 00:00:00 2001
From: Dmytro Sadovnychyi <git@dmit.ro>
Date: Thu, 16 Nov 2017 15:49:26 +0800
Subject: [PATCH 06/54] Use lodash.isFinite instead of isNaN for IE support

---
 package.json                      | 1 +
 src/plugins/Dashboard/FileItem.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dca12cca5..d870c4b51 100644
--- a/package.json
+++ b/package.json
@@ -104,6 +104,7 @@
     "drag-drop": "2.13.2",
     "es6-promise": "3.2.1",
     "get-form-data": "^1.2.5",
+    "lodash.isfinite": "^3.3.2",
     "lodash.throttle": "4.1.1",
     "mime-match": "^1.0.2",
     "namespace-emitter": "^2.0.0",
diff --git a/src/plugins/Dashboard/FileItem.js b/src/plugins/Dashboard/FileItem.js
index 528bd6d0f..55a249c5e 100644
--- a/src/plugins/Dashboard/FileItem.js
+++ b/src/plugins/Dashboard/FileItem.js
@@ -1,4 +1,5 @@
 const html = require('yo-yo')
+const isFinite = require('lodash.isfinite')
 const { getETA,
          getSpeed,
          prettyETA,
@@ -99,7 +100,7 @@ module.exports = function fileItem (props) {
         }
       </h4>
       <div class="UppyDashboardItem-status">
-        ${isNaN(file.data.size) ? '' : html`<div class="UppyDashboardItem-statusSize">${prettyBytes(file.data.size)}</div>`}
+        ${isFinite(file.data.size) ? html`<div class="UppyDashboardItem-statusSize">${prettyBytes(file.data.size)}</div>` : ''}
         ${file.source && html`<div class="UppyDashboardItem-sourceIcon">
             ${acquirers.map(acquirer => {
               if (acquirer.id === file.source) return html`<span title="${props.i18n('fileSource')}: ${acquirer.name}">${acquirer.icon()}</span>`

From e8971eb7352c8360cccde2403ad3d3f69638762d Mon Sep 17 00:00:00 2001
From: Dmytro Sadovnychyi <git@dmit.ro>
Date: Thu, 16 Nov 2017 18:21:57 +0800
Subject: [PATCH 07/54] Add/remove folder contents on checkbox change

---
 src/generic-provider-views/Table.js    |  9 +++-
 src/generic-provider-views/TableRow.js |  2 +-
 src/generic-provider-views/index.js    | 69 ++++++++++++++++++++++++--
 src/plugins/Plugin.js                  | 12 ++---
 4 files changed, 79 insertions(+), 13 deletions(-)

diff --git a/src/generic-provider-views/Table.js b/src/generic-provider-views/Table.js
index 7d89353ea..2f05701d5 100644
--- a/src/generic-provider-views/Table.js
+++ b/src/generic-provider-views/Table.js
@@ -18,12 +18,18 @@ module.exports = (props) => {
     <table class="BrowserTable" onscroll=${props.handleScroll}>
       <tbody role="listbox" aria-label="List of files from ${props.title}">
         ${props.folders.map((folder) => {
+          let isDisabled = false
+          let isChecked = props.isChecked(folder)
+          if (isChecked) {
+            isDisabled = isChecked.loading
+          }
           return Row({
             title: props.getItemName(folder),
             active: props.activeRow(folder),
             getItemIcon: () => props.getItemIcon(folder),
             handleClick: () => props.handleFolderClick(folder),
-            isChecked: props.isChecked(folder),
+            isDisabled: isDisabled,
+            isChecked: isChecked,
             handleCheckboxClick: (e) => props.toggleCheckbox(e, folder),
             columns: props.columns
           })
@@ -34,6 +40,7 @@ module.exports = (props) => {
             active: props.activeRow(file),
             getItemIcon: () => props.getItemIcon(file),
             handleClick: () => props.handleFileClick(file),
+            isDisabled: false,
             isChecked: props.isChecked(file),
             handleCheckboxClick: (e) => props.toggleCheckbox(e, file),
             columns: props.columns
diff --git a/src/generic-provider-views/TableRow.js b/src/generic-provider-views/TableRow.js
index a7ff22a69..b56bc4b62 100644
--- a/src/generic-provider-views/TableRow.js
+++ b/src/generic-provider-views/TableRow.js
@@ -10,7 +10,7 @@ module.exports = (props) => {
   return html`
     <tr onclick=${props.handleClick} onkeydown=${handleKeyDown} class=${classes} role="option" tabindex="0">
       <td onclick=${props.handleCheckboxClick} class="BrowserTable-column">
-        <input type="checkbox" checked=${props.isChecked} />
+        <input type="checkbox" checked=${props.isChecked} disabled=${props.isDisabled} />
       </td>
       ${Column({
         getItemIcon: props.getItemIcon,
diff --git a/src/generic-provider-views/index.js b/src/generic-provider-views/index.js
index 50e1d9784..bb53f7eae 100644
--- a/src/generic-provider-views/index.js
+++ b/src/generic-provider-views/index.js
@@ -313,8 +313,59 @@ module.exports = class View {
     return this.plugin.core.getState()[this.plugin.stateId].activeRow === this.plugin.getItemId(file)
   }
 
-  isChecked (file) {
-    return (this.fileToId(file) in this.plugin.core.getState().files)
+  isChecked (item) {
+    const itemId = this.fileToId(item)
+    if (this.plugin.isFolder(item)) {
+      const state = this.plugin.core.getState()[this.plugin.stateId]
+      const folders = state.selectedFolders || {}
+      if (itemId in folders) {
+        return folders[itemId]
+      }
+      return false
+    }
+    return (itemId in this.plugin.core.getState().files)
+  }
+
+  addFolder (folder) {
+    const folderId = this.fileToId(folder)
+    let state = this.plugin.core.getState()[this.plugin.stateId]
+    let folders = state.selectedFolders || {}
+    if (folderId in folders && folders[folderId].loading) {
+      return
+    }
+    folders[folderId] = {loading: true, files: []}
+    this.updateState({selectedFolders: folders})
+    this.Provider.list(this.plugin.getItemRequestPath(folder)).then((res) => {
+      let files = []
+      this.plugin.getItemSubList(res).forEach((item) => {
+        if (!this.plugin.isFolder(item)) {
+          this.addFile(item, true)
+          files.push(this.fileToId(item))
+        }
+      })
+      state = this.plugin.core.getState()[this.plugin.stateId]
+      state.selectedFolders[folderId] = {loading: false, files: files}
+      this.updateState({selectedFolders: folders})
+    })
+  }
+
+  removeFolder (folderId) {
+    let state = this.plugin.core.getState()[this.plugin.stateId]
+    let folders = state.selectedFolders || {}
+    if (!(folderId in folders)) {
+      return
+    }
+    let folder = folders[folderId]
+    if (folder.loading) {
+      return
+    }
+    for (let fileId of folder.files) {
+      if (fileId in this.plugin.core.getState().files) {
+        this.plugin.core.removeFile(fileId)
+      }
+    }
+    delete folders[folderId]
+    this.updateState({selectedFolders: folders})
   }
 
   toggleCheckbox (e, file) {
@@ -339,13 +390,21 @@ module.exports = class View {
     if (this.isChecked(file)) {
       for (let item of itemsToToggle) {
         const itemId = this.fileToId(item)
-        if (itemId in this.plugin.core.getState().files) {
-          this.plugin.core.removeFile(itemId)
+        if (this.plugin.isFolder(item)) {
+          this.removeFolder(itemId)
+        } else {
+          if (itemId in this.plugin.core.getState().files) {
+            this.plugin.core.removeFile(itemId)
+          }
         }
       }
     } else {
       for (let item of itemsToToggle) {
-        this.addFile(item, true)
+        if (this.plugin.isFolder(item)) {
+          this.addFolder(item)
+        } else {
+          this.addFile(item, true)
+        }
       }
     }
   }
diff --git a/src/plugins/Plugin.js b/src/plugins/Plugin.js
index d13306de3..50f3b1567 100644
--- a/src/plugins/Plugin.js
+++ b/src/plugins/Plugin.js
@@ -1,5 +1,5 @@
 const yo = require('yo-yo')
-// const nanoraf = require('nanoraf')
+const nanoraf = require('nanoraf')
 const { findDOMElement } = require('../core/Utils')
 const getFormData = require('get-form-data')
 
@@ -63,12 +63,12 @@ module.exports = class Plugin {
     const targetElement = findDOMElement(target)
 
     // Set up nanoraf.
-    // this.updateUI = nanoraf((state) => {
-    //   this.el = yo.update(this.el, this.render(state))
-    // })
-    this.updateUI = (state) => {
+    this.updateUI = nanoraf((state) => {
       this.el = yo.update(this.el, this.render(state))
-    }
+    })
+    // this.updateUI = (state) => {
+    //   this.el = yo.update(this.el, this.render(state))
+    // }
 
     if (targetElement) {
       this.core.log(`Installing ${callerPluginName} to a DOM element`)

From 5f17d0d001e09fd47913ca81f9dcca387593f6a4 Mon Sep 17 00:00:00 2001
From: Dmytro Sadovnychyi <git@dmit.ro>
Date: Thu, 16 Nov 2017 18:24:16 +0800
Subject: [PATCH 08/54] Remove isFolder property from files

---
 src/core/Core.js                    | 1 -
 src/generic-provider-views/index.js | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/core/Core.js b/src/core/Core.js
index efe49864c..e45ba7931 100644
--- a/src/core/Core.js
+++ b/src/core/Core.js
@@ -339,7 +339,6 @@ class Uppy {
           size: file.data.size || 'N/A',
           isRemote: isRemote,
           isCheckbox: file.isCheckbox || false,
-          isFolder: file.isFolder || false,
           remote: file.remote || '',
           preview: file.preview
         }
diff --git a/src/generic-provider-views/index.js b/src/generic-provider-views/index.js
index bb53f7eae..cc6dc26ea 100644
--- a/src/generic-provider-views/index.js
+++ b/src/generic-provider-views/index.js
@@ -157,7 +157,6 @@ module.exports = class View {
       type: this.plugin.getMimeType(file),
       isRemote: true,
       isCheckbox: isCheckbox,
-      isFolder: this.plugin.isFolder(file),
       body: {
         fileId: this.plugin.getItemId(file)
       },

From f1dd42c9169f5fe5997a839b887569a5f5b213a8 Mon Sep 17 00:00:00 2001
From: Dmytro Sadovnychyi <git@dmit.ro>
Date: Thu, 16 Nov 2017 18:37:07 +0800
Subject: [PATCH 09/54] No need to check for isFinite since folders are no
 longer displayed

---
 package.json                      | 1 -
 src/plugins/Dashboard/FileItem.js | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/package.json b/package.json
index d870c4b51..dca12cca5 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,6 @@
     "drag-drop": "2.13.2",
     "es6-promise": "3.2.1",
     "get-form-data": "^1.2.5",
-    "lodash.isfinite": "^3.3.2",
     "lodash.throttle": "4.1.1",
     "mime-match": "^1.0.2",
     "namespace-emitter": "^2.0.0",
diff --git a/src/plugins/Dashboard/FileItem.js b/src/plugins/Dashboard/FileItem.js
index 55a249c5e..864f68293 100644
--- a/src/plugins/Dashboard/FileItem.js
+++ b/src/plugins/Dashboard/FileItem.js
@@ -1,5 +1,4 @@
 const html = require('yo-yo')
-const isFinite = require('lodash.isfinite')
 const { getETA,
          getSpeed,
          prettyETA,
@@ -100,7 +99,7 @@ module.exports = function fileItem (props) {
         }
       </h4>
       <div class="UppyDashboardItem-status">
-        ${isFinite(file.data.size) ? html`<div class="UppyDashboardItem-statusSize">${prettyBytes(file.data.size)}</div>` : ''}
+        ${file.data.size && html`<div class="UppyDashboardItem-statusSize">${prettyBytes(file.data.size)}</div>`}
         ${file.source && html`<div class="UppyDashboardItem-sourceIcon">
             ${acquirers.map(acquirer => {
               if (acquirer.id === file.source) return html`<span title="${props.i18n('fileSource')}: ${acquirer.name}">${acquirer.icon()}</span>`

From 1d0fdddb50767ccda84780e2c3fdea4cf982551f Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Thu, 16 Nov 2017 14:43:36 -0500
Subject: [PATCH 10/54] Set `this.target` in `Plugin` class

Set `this.target = this.el` when`target` in a DOM element, if `target` is a plugin, set to `this.target = targetPlugin.addTarget(plugin)`
---
 src/plugins/Dashboard/index.js | 4 ++--
 src/plugins/Plugin.js          | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/Dashboard/index.js b/src/plugins/Dashboard/index.js
index b564629fb..40d482da0 100644
--- a/src/plugins/Dashboard/index.js
+++ b/src/plugins/Dashboard/index.js
@@ -176,8 +176,8 @@ module.exports = class DashboardUI extends Plugin {
 
   setFocusToFirstNode () {
     const focusableNodes = this.getFocusableNodes()
-    console.log(focusableNodes)
-    console.log(focusableNodes[0])
+    // console.log(focusableNodes)
+    // console.log(focusableNodes[0])
     if (focusableNodes.length) focusableNodes[0].focus()
   }
 
diff --git a/src/plugins/Plugin.js b/src/plugins/Plugin.js
index d13306de3..272546ee4 100644
--- a/src/plugins/Plugin.js
+++ b/src/plugins/Plugin.js
@@ -87,9 +87,9 @@ module.exports = class Plugin {
       this.el = plugin.render(this.core.state)
       targetElement.appendChild(this.el)
 
-      this.target = targetElement
+      this.target = this.el
 
-      return targetElement
+      return this.target
     }
 
     let targetPlugin
@@ -111,8 +111,8 @@ module.exports = class Plugin {
     if (targetPlugin) {
       const targetPluginName = targetPlugin.id
       this.core.log(`Installing ${callerPluginName} to ${targetPluginName}`)
-      this.target = targetPlugin
-      return targetPlugin.addTarget(plugin)
+      this.target = targetPlugin.addTarget(plugin)
+      return this.target
     }
 
     this.core.log(`Not installing ${callerPluginName}`)

From f046d3ddcdb91bd200e227f70ec7c6987c2ce6f5 Mon Sep 17 00:00:00 2001
From: Dmytro Sadovnychyi <git@dmit.ro>
Date: Fri, 17 Nov 2017 15:24:15 +0800
Subject: [PATCH 11/54] Handle errors when adding a folder

---
 src/generic-provider-views/index.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/generic-provider-views/index.js b/src/generic-provider-views/index.js
index cc6dc26ea..b94dd203f 100644
--- a/src/generic-provider-views/index.js
+++ b/src/generic-provider-views/index.js
@@ -345,6 +345,11 @@ module.exports = class View {
       state = this.plugin.core.getState()[this.plugin.stateId]
       state.selectedFolders[folderId] = {loading: false, files: files}
       this.updateState({selectedFolders: folders})
+    }).catch((e) => {
+      state = this.plugin.core.getState()[this.plugin.stateId]
+      delete state.selectedFolders[folderId]
+      this.updateState({selectedFolders: state.selectedFolders})
+      this.handleError(e)
     })
   }
 

From 35b16241f740d555e2147444476e8d897d5e76c6 Mon Sep 17 00:00:00 2001
From: Dmytro Sadovnychyi <git@dmit.ro>
Date: Fri, 17 Nov 2017 15:32:13 +0800
Subject: [PATCH 12/54] Add info message with number of files added from folder

---
 src/generic-provider-views/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/generic-provider-views/index.js b/src/generic-provider-views/index.js
index b94dd203f..4f7ba6a9e 100644
--- a/src/generic-provider-views/index.js
+++ b/src/generic-provider-views/index.js
@@ -345,6 +345,7 @@ module.exports = class View {
       state = this.plugin.core.getState()[this.plugin.stateId]
       state.selectedFolders[folderId] = {loading: false, files: files}
       this.updateState({selectedFolders: folders})
+      this.plugin.core.info(`Added ${files.length} files from ${this.plugin.getItemName(folder)}`, 'success', 3000)
     }).catch((e) => {
       state = this.plugin.core.getState()[this.plugin.stateId]
       delete state.selectedFolders[folderId]

From 47b0434c9f6dced10215958663d64d9da82cdce2 Mon Sep 17 00:00:00 2001
From: Dmytro Sadovnychyi <git@dmit.ro>
Date: Fri, 17 Nov 2017 17:06:16 +0800
Subject: [PATCH 13/54] fileToId -> providerFileToId

---
 src/generic-provider-views/index.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/generic-provider-views/index.js b/src/generic-provider-views/index.js
index 4f7ba6a9e..498391d0c 100644
--- a/src/generic-provider-views/index.js
+++ b/src/generic-provider-views/index.js
@@ -313,7 +313,7 @@ module.exports = class View {
   }
 
   isChecked (item) {
-    const itemId = this.fileToId(item)
+    const itemId = this.providerFileToId(item)
     if (this.plugin.isFolder(item)) {
       const state = this.plugin.core.getState()[this.plugin.stateId]
       const folders = state.selectedFolders || {}
@@ -326,7 +326,7 @@ module.exports = class View {
   }
 
   addFolder (folder) {
-    const folderId = this.fileToId(folder)
+    const folderId = this.providerFileToId(folder)
     let state = this.plugin.core.getState()[this.plugin.stateId]
     let folders = state.selectedFolders || {}
     if (folderId in folders && folders[folderId].loading) {
@@ -339,7 +339,7 @@ module.exports = class View {
       this.plugin.getItemSubList(res).forEach((item) => {
         if (!this.plugin.isFolder(item)) {
           this.addFile(item, true)
-          files.push(this.fileToId(item))
+          files.push(this.providerFileToId(item))
         }
       })
       state = this.plugin.core.getState()[this.plugin.stateId]
@@ -394,7 +394,7 @@ module.exports = class View {
     this.lastCheckbox = file
     if (this.isChecked(file)) {
       for (let item of itemsToToggle) {
-        const itemId = this.fileToId(item)
+        const itemId = this.providerFileToId(item)
         if (this.plugin.isFolder(item)) {
           this.removeFolder(itemId)
         } else {
@@ -414,7 +414,7 @@ module.exports = class View {
     }
   }
 
-  fileToId (file) {
+  providerFileToId (file) {
     return Utils.generateFileID({
       data: this.plugin.getItemData(file),
       name: this.plugin.getItemName(file) || this.plugin.getItemId(file),

From 998178d215ceb582df2e4cb853a75cb727007be1 Mon Sep 17 00:00:00 2001
From: Dmytro Sadovnychyi <git@dmit.ro>
Date: Fri, 17 Nov 2017 17:33:23 +0800
Subject: [PATCH 14/54] Remove isCheckbox core property; Manually call
 hideAllPanels instead

---
 src/core/Core.js                    |  1 -
 src/generic-provider-views/index.js |  4 +++-
 src/plugins/Dashboard/index.js      | 10 +++-------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/core/Core.js b/src/core/Core.js
index e45ba7931..e0520931c 100644
--- a/src/core/Core.js
+++ b/src/core/Core.js
@@ -338,7 +338,6 @@ class Uppy {
           },
           size: file.data.size || 'N/A',
           isRemote: isRemote,
-          isCheckbox: file.isCheckbox || false,
           remote: file.remote || '',
           preview: file.preview
         }
diff --git a/src/generic-provider-views/index.js b/src/generic-provider-views/index.js
index 498391d0c..99d7aca76 100644
--- a/src/generic-provider-views/index.js
+++ b/src/generic-provider-views/index.js
@@ -156,7 +156,6 @@ module.exports = class View {
       name: this.plugin.getItemName(file) || this.plugin.getItemId(file),
       type: this.plugin.getMimeType(file),
       isRemote: true,
-      isCheckbox: isCheckbox,
       body: {
         fileId: this.plugin.getItemId(file)
       },
@@ -175,6 +174,9 @@ module.exports = class View {
       }
       this.plugin.core.log('Adding remote file')
       this.plugin.core.addFile(tagFile)
+      if (!isCheckbox) {
+        this.plugin.core.getPlugin('Dashboard').hideAllPanels()
+      }
     })
   }
 
diff --git a/src/plugins/Dashboard/index.js b/src/plugins/Dashboard/index.js
index 9ec3358ad..26d518ee8 100644
--- a/src/plugins/Dashboard/index.js
+++ b/src/plugins/Dashboard/index.js
@@ -140,11 +140,9 @@ module.exports = class DashboardUI extends Plugin {
   }
 
   hideAllPanels (file) {
-    if (!file.isCheckbox) {
-      this.setPluginState({
-        activePanel: false
-      })
-    }
+    this.setPluginState({
+      activePanel: false
+    })
   }
 
   showPanel (id) {
@@ -278,7 +276,6 @@ module.exports = class DashboardUI extends Plugin {
   }
 
   actions () {
-    this.core.on('core:file-added', this.hideAllPanels)
     this.core.on('dashboard:file-card', this.handleFileCard)
 
     window.addEventListener('resize', this.updateDashboardElWidth)
@@ -287,7 +284,6 @@ module.exports = class DashboardUI extends Plugin {
   removeActions () {
     window.removeEventListener('resize', this.updateDashboardElWidth)
 
-    this.core.off('core:file-added', this.hideAllPanels)
     this.core.off('dashboard:file-card', this.handleFileCard)
   }
 

From 0bde3083db05229151af3f327c2db966c389709e Mon Sep 17 00:00:00 2001
From: Dmytro Sadovnychyi <git@dmit.ro>
Date: Fri, 17 Nov 2017 17:34:28 +0800
Subject: [PATCH 15/54] Remove unused argument

---
 src/plugins/Dashboard/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/Dashboard/index.js b/src/plugins/Dashboard/index.js
index 26d518ee8..a65913c27 100644
--- a/src/plugins/Dashboard/index.js
+++ b/src/plugins/Dashboard/index.js
@@ -139,7 +139,7 @@ module.exports = class DashboardUI extends Plugin {
     return this.target
   }
 
-  hideAllPanels (file) {
+  hideAllPanels () {
     this.setPluginState({
       activePanel: false
     })

From 5c94437bdc153b0d83b2673197980499d41a63c4 Mon Sep 17 00:00:00 2001
From: Dmytro Sadovnychyi <git@dmit.ro>
Date: Fri, 17 Nov 2017 18:14:07 +0800
Subject: [PATCH 16/54] Update folder state when file is removed from main
 screen

---
 src/generic-provider-views/index.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/generic-provider-views/index.js b/src/generic-provider-views/index.js
index 99d7aca76..46ef4fe71 100644
--- a/src/generic-provider-views/index.js
+++ b/src/generic-provider-views/index.js
@@ -71,6 +71,10 @@ module.exports = class View {
     this.handleError = this.handleError.bind(this)
     this.handleScroll = this.handleScroll.bind(this)
 
+    this.plugin.core.on('core:file-removed', (fileId) => {
+      this.updateFolderState(fileId)
+    })
+
     // Visual
     this.render = this.render.bind(this)
   }
@@ -375,6 +379,25 @@ module.exports = class View {
     this.updateState({selectedFolders: folders})
   }
 
+  updateFolderState (fileId) {
+    let state = this.plugin.core.getState()[this.plugin.stateId]
+    let folders = state.selectedFolders || {}
+    for (let folderId in folders) {
+      let folder = folders[folderId]
+      if (folder.loading) {
+        continue
+      }
+      let i = folder.files.indexOf(fileId)
+      if (i > -1) {
+        folder.files.splice(i, 1)
+      }
+      if (!folder.files.length) {
+        delete folders[folderId]
+      }
+    }
+    this.updateState({selectedFolders: folders})
+  }
+
   toggleCheckbox (e, file) {
     e.stopPropagation()
     e.preventDefault()

From 48844282c4e7987ec8ba9d0a89775e06e6ffc23a Mon Sep 17 00:00:00 2001
From: Dmytro Sadovnychyi <git@dmit.ro>
Date: Fri, 17 Nov 2017 18:44:07 +0800
Subject: [PATCH 17/54] Fix wrong i18n assignment in dashboard

---
 src/plugins/Dashboard/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/Dashboard/index.js b/src/plugins/Dashboard/index.js
index a65913c27..578e18227 100644
--- a/src/plugins/Dashboard/index.js
+++ b/src/plugins/Dashboard/index.js
@@ -80,7 +80,7 @@ module.exports = class DashboardUI extends Plugin {
     this.locale.strings = Object.assign({}, defaultLocale.strings, this.opts.locale.strings)
 
     this.translator = new Translator({locale: this.locale})
-    this.containerWidth = this.translator.translate.bind(this.translator)
+    this.i18n = this.translator.translate.bind(this.translator)
 
     this.closeModal = this.closeModal.bind(this)
     this.requestCloseModal = this.requestCloseModal.bind(this)
@@ -422,7 +422,7 @@ module.exports = class DashboardUI extends Plugin {
       showPanel: this.showPanel,
       hideAllPanels: this.hideAllPanels,
       log: this.core.log,
-      i18n: this.containerWidth,
+      i18n: this.i18n,
       pauseAll: this.pauseAll,
       resumeAll: this.resumeAll,
       addFile: this.core.addFile,

From 912b6b8714d4f0489652a8dfc8a718a0cc3579db Mon Sep 17 00:00:00 2001
From: Dmytro Sadovnychyi <git@dmit.ro>
Date: Fri, 17 Nov 2017 18:44:47 +0800
Subject: [PATCH 18/54] Add i18n for folder message

---
 src/generic-provider-views/index.js | 5 ++++-
 src/plugins/Dashboard/index.js      | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/generic-provider-views/index.js b/src/generic-provider-views/index.js
index 46ef4fe71..ce6a46b5a 100644
--- a/src/generic-provider-views/index.js
+++ b/src/generic-provider-views/index.js
@@ -351,7 +351,10 @@ module.exports = class View {
       state = this.plugin.core.getState()[this.plugin.stateId]
       state.selectedFolders[folderId] = {loading: false, files: files}
       this.updateState({selectedFolders: folders})
-      this.plugin.core.info(`Added ${files.length} files from ${this.plugin.getItemName(folder)}`, 'success', 3000)
+      const dashboard = this.plugin.core.getPlugin('Dashboard')
+      this.plugin.core.info(dashboard.i18n('folderAdded', {
+        smart_count: files.length, folder: this.plugin.getItemName(folder)
+      }))
     }).catch((e) => {
       state = this.plugin.core.getState()[this.plugin.stateId]
       delete state.selectedFolders[folderId]
diff --git a/src/plugins/Dashboard/index.js b/src/plugins/Dashboard/index.js
index 578e18227..7f0e0a467 100644
--- a/src/plugins/Dashboard/index.js
+++ b/src/plugins/Dashboard/index.js
@@ -51,7 +51,11 @@ module.exports = class DashboardUI extends Plugin {
         browse: 'browse',
         fileProgress: 'File progress: upload speed and ETA',
         numberOfSelectedFiles: 'Number of selected files',
-        uploadAllNewFiles: 'Upload all new files'
+        uploadAllNewFiles: 'Upload all new files',
+        folderAdded: {
+          0: 'Added %{smart_count} file from %{folder}',
+          1: 'Added %{smart_count} files from %{folder}'
+        }
       }
     }
 

From e6eec307839eb95066b3437a2c1948d6319dccbe Mon Sep 17 00:00:00 2001
From: Dmytro Sadovnychyi <git@dmit.ro>
Date: Fri, 17 Nov 2017 19:08:20 +0800
Subject: [PATCH 19/54] Add another message for empty folders

---
 src/generic-provider-views/index.js | 12 +++++++++---
 src/plugins/Dashboard/index.js      |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/generic-provider-views/index.js b/src/generic-provider-views/index.js
index ce6a46b5a..b0abafa96 100644
--- a/src/generic-provider-views/index.js
+++ b/src/generic-provider-views/index.js
@@ -352,9 +352,15 @@ module.exports = class View {
       state.selectedFolders[folderId] = {loading: false, files: files}
       this.updateState({selectedFolders: folders})
       const dashboard = this.plugin.core.getPlugin('Dashboard')
-      this.plugin.core.info(dashboard.i18n('folderAdded', {
-        smart_count: files.length, folder: this.plugin.getItemName(folder)
-      }))
+      let message
+      if (files.length) {
+        message = dashboard.i18n('folderAdded', {
+          smart_count: files.length, folder: this.plugin.getItemName(folder)
+        })
+      } else {
+        message = dashboard.i18n('emptyFolderAdded')
+      }
+      this.plugin.core.info(message)
     }).catch((e) => {
       state = this.plugin.core.getState()[this.plugin.stateId]
       delete state.selectedFolders[folderId]
diff --git a/src/plugins/Dashboard/index.js b/src/plugins/Dashboard/index.js
index 7f0e0a467..2e8d3241a 100644
--- a/src/plugins/Dashboard/index.js
+++ b/src/plugins/Dashboard/index.js
@@ -52,6 +52,7 @@ module.exports = class DashboardUI extends Plugin {
         fileProgress: 'File progress: upload speed and ETA',
         numberOfSelectedFiles: 'Number of selected files',
         uploadAllNewFiles: 'Upload all new files',
+        emptyFolderAdded: 'No files were added from empty folder',
         folderAdded: {
           0: 'Added %{smart_count} file from %{folder}',
           1: 'Added %{smart_count} files from %{folder}'

From 96c5905a698532628a73838f021bf549eb5a4dec Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Sat, 18 Nov 2017 00:39:39 -0500
Subject: [PATCH 20/54] Expect root element, not parent, to be returned from
 mount

---
 src/plugins/Plugin.test.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/plugins/Plugin.test.js b/src/plugins/Plugin.test.js
index dc4f45591..b08729bda 100644
--- a/src/plugins/Plugin.test.js
+++ b/src/plugins/Plugin.test.js
@@ -259,14 +259,10 @@ describe('Plugin', () => {
       })
 
       it('returns the target DOM element', () => {
-        plugin = new Plugin(mockCore, {replaceTargetContent: true})
+        plugin = new Plugin(mockCore)
         plugin.render = () => {}
         const target = plugin.mount(mockTarget, mockPlugin)
-        expect(target).toEqual({
-          nodeName: 'FORM',
-          innerHTML: '',
-          appendChild
-        })
+        expect(target).toEqual({ el: 'lo' })
       })
     })
 

From 98f54c0899b0b59d1e02bcc0ee41e04a6f85a97f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9e=20Kooi?= <renee@kooi.me>
Date: Mon, 20 Nov 2017 10:02:50 +0100
Subject: [PATCH 21/54] ignore bundled files from lint

---
 .eslintignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintignore b/.eslintignore
index b3330d45a..e0bdfe0c8 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -10,3 +10,4 @@ website/public/**
 website/themes/uppy/source/js/smooth-scroll.min.js
 website/themes/uppy/source/js/uppy.js
 website/themes/uppy/source/uppy/**
+bundle.js

From 7a7dd752f8ac8f19c9c3ec76de9b1742ead80c50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9e=20Kooi?= <renee@kooi.me>
Date: Mon, 20 Nov 2017 10:04:44 +0100
Subject: [PATCH 22/54] xhrupload: Limit amount of simultaneous uploads

---
 src/core/Utils.js        | 40 +++++++++++++++++++++++++++++++++++++++-
 src/core/Utils.test.js   | 29 +++++++++++++++++++++++++++++
 src/plugins/XHRUpload.js | 14 +++++++++-----
 3 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/src/core/Utils.js b/src/core/Utils.js
index eba412400..1fb2f8f00 100644
--- a/src/core/Utils.js
+++ b/src/core/Utils.js
@@ -526,6 +526,43 @@ function settle (promises) {
   })
 }
 
+/**
+ * Limit the amount of simultaneously pending Promises.
+ * Returns a function that, when passed a function `fn`,
+ * will make sure that at most `limit` calls to `fn` are pending.
+ *
+ * @param {number} limit
+ * @return {function()}
+ */
+function limitPromises (limit) {
+  let pending = 0
+  const queue = []
+  return (fn) => {
+    return (...args) => {
+      const call = () => {
+        pending++
+        const promise = fn(...args)
+        promise.then(onfinish, onfinish)
+        return promise
+      }
+
+      if (pending >= limit) {
+        return new Promise((resolve, reject) => {
+          queue.push(() => {
+            call().then(resolve, reject)
+          })
+        })
+      }
+      return call()
+    }
+  }
+  function onfinish () {
+    pending--
+    const next = queue.shift()
+    if (next) next()
+  }
+}
+
 module.exports = {
   generateFileID,
   toArray,
@@ -553,5 +590,6 @@ module.exports = {
   findAllDOMElements,
   getSocketHost,
   emitSocketProgress,
-  settle
+  settle,
+  limitPromises
 }
diff --git a/src/core/Utils.test.js b/src/core/Utils.test.js
index 3269baf30..5c293b2af 100644
--- a/src/core/Utils.test.js
+++ b/src/core/Utils.test.js
@@ -370,4 +370,33 @@ describe('core/utils', () => {
       })
     })
   })
+
+  describe('limitPromises', () => {
+    it('should run at most N promises at the same time', () => {
+      let pending = 0
+      function fn () {
+        pending++
+        return new Promise((resolve) => setTimeout(resolve, 10))
+          .then(() => pending--)
+      }
+
+      const limit = utils.limitPromises(4)
+      const fn2 = limit(fn)
+
+      const result = Promise.all([
+        fn2(), fn2(), fn2(), fn2(),
+        fn2(), fn2(), fn2(), fn2(),
+        fn2(), fn2()
+      ])
+
+      expect(pending).toBe(4)
+      setTimeout(() => {
+        expect(pending).toBe(4)
+      }, 10)
+
+      return result.then(() => {
+        expect(pending).toBe(0)
+      })
+    })
+  })
 })
diff --git a/src/plugins/XHRUpload.js b/src/plugins/XHRUpload.js
index 453e6b1cc..b83643ad0 100644
--- a/src/plugins/XHRUpload.js
+++ b/src/plugins/XHRUpload.js
@@ -5,7 +5,8 @@ const UppySocket = require('../core/UppySocket')
 const {
   emitSocketProgress,
   getSocketHost,
-  settle
+  settle,
+  limitPromises
 } = require('../core/Utils')
 
 module.exports = class XHRUpload extends Plugin {
@@ -248,19 +249,22 @@ module.exports = class XHRUpload extends Plugin {
   }
 
   uploadFiles (files) {
-    const promises = files.map((file, i) => {
+    const actions = files.map((file, i) => {
       const current = parseInt(i, 10) + 1
       const total = files.length
 
       if (file.error) {
-        return Promise.reject(new Error(file.error))
+        return () => Promise.reject(new Error(file.error))
       } else if (file.isRemote) {
-        return this.uploadRemote(file, current, total)
+        return this.uploadRemote.bind(this, file, current, total)
       } else {
-        return this.upload(file, current, total)
+        return this.upload.bind(this, file, current, total)
       }
     })
 
+    const promises = actions
+      .map(limitPromises(5))
+      .map((action) => action())
     return settle(promises)
   }
 

From ea8ab5d78039f87541d29bc90644b7b76c242449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9e=20Kooi?= <renee@kooi.me>
Date: Mon, 20 Nov 2017 10:14:52 +0100
Subject: [PATCH 23/54] xhrupload: Configurable limit

---
 src/core/Utils.test.js        | 31 ++++++++++++++++++++++++-------
 src/plugins/XHRUpload.js      | 11 ++++++++++-
 website/src/docs/xhrupload.md |  4 ++++
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/core/Utils.test.js b/src/core/Utils.test.js
index 5c293b2af..275897ebc 100644
--- a/src/core/Utils.test.js
+++ b/src/core/Utils.test.js
@@ -372,14 +372,14 @@ describe('core/utils', () => {
   })
 
   describe('limitPromises', () => {
-    it('should run at most N promises at the same time', () => {
-      let pending = 0
-      function fn () {
-        pending++
-        return new Promise((resolve) => setTimeout(resolve, 10))
-          .then(() => pending--)
-      }
+    let pending = 0
+    function fn () {
+      pending++
+      return new Promise((resolve) => setTimeout(resolve, 10))
+        .then(() => pending--)
+    }
 
+    it('should run at most N promises at the same time', () => {
       const limit = utils.limitPromises(4)
       const fn2 = limit(fn)
 
@@ -398,5 +398,22 @@ describe('core/utils', () => {
         expect(pending).toBe(0)
       })
     })
+
+    it('should accept Infinity as limit', () => {
+      const limit = utils.limitPromises(Infinity)
+      const fn2 = limit(fn)
+
+      const result = Promise.all([
+        fn2(), fn2(), fn2(), fn2(),
+        fn2(), fn2(), fn2(), fn2(),
+        fn2(), fn2()
+      ])
+
+      expect(pending).toBe(10)
+
+      return result.then(() => {
+        expect(pending).toBe(0)
+      })
+    })
   })
 })
diff --git a/src/plugins/XHRUpload.js b/src/plugins/XHRUpload.js
index b83643ad0..d74fb6129 100644
--- a/src/plugins/XHRUpload.js
+++ b/src/plugins/XHRUpload.js
@@ -33,6 +33,7 @@ module.exports = class XHRUpload extends Plugin {
       headers: {},
       locale: defaultLocale,
       timeout: 30 * 1000,
+      limit: 0,
       getResponseData (xhr) {
         return JSON.parse(xhr.response)
       },
@@ -51,6 +52,13 @@ module.exports = class XHRUpload extends Plugin {
     this.i18n = this.translator.translate.bind(this.translator)
 
     this.handleUpload = this.handleUpload.bind(this)
+
+    // Simultaneous upload limiting is shared across all uploads with this plugin.
+    if (typeof this.opts.limit === 'number' && this.opts.limit !== 0) {
+      this.limitUploads = limitPromises(this.opts.limit)
+    } else {
+      this.limitUploads = (fn) => fn
+    }
   }
 
   getOptions (file) {
@@ -263,8 +271,9 @@ module.exports = class XHRUpload extends Plugin {
     })
 
     const promises = actions
-      .map(limitPromises(5))
+      .map(this.limitUploads)
       .map((action) => action())
+
     return settle(promises)
   }
 
diff --git a/website/src/docs/xhrupload.md b/website/src/docs/xhrupload.md
index dc0640147..d67df5721 100644
--- a/website/src/docs/xhrupload.md
+++ b/website/src/docs/xhrupload.md
@@ -108,5 +108,9 @@ Set to `0` to disable this check.
 
 The default is 30 seconds.
 
+### `limit: 0`
+
+Limit the amount of uploads going on at the same time. Passing `0` means no limit.
+
 [FormData]: https://developer.mozilla.org/en-US/docs/Web/API/FormData
 [XHR.timeout]: https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/timeout

From d4396d4e1f9d2fe9a0b54487cd1b313e9e700c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9e=20Kooi?= <renee@kooi.me>
Date: Mon, 20 Nov 2017 11:56:57 +0100
Subject: [PATCH 24/54] transloadit: Port old tests from tape

---
 src/plugins/Transloadit/index.test.js | 173 ++++++++++++++++++++++++++
 1 file changed, 173 insertions(+)
 create mode 100644 src/plugins/Transloadit/index.test.js

diff --git a/src/plugins/Transloadit/index.test.js b/src/plugins/Transloadit/index.test.js
new file mode 100644
index 000000000..431bef298
--- /dev/null
+++ b/src/plugins/Transloadit/index.test.js
@@ -0,0 +1,173 @@
+const Core = require('../../core')
+const Transloadit = require('./')
+
+describe('Transloadit', () => {
+  it('Throws errors if options are missing', () => {
+    const uppy = new Core()
+
+    expect(() => {
+      uppy.use(Transloadit, { params: {} })
+    }).toThrowError(/The `params\.auth\.key` option is required/)
+  })
+
+  it('Accepts a JSON string as `params` for signature authentication', () => {
+    const uppy = new Core()
+
+    expect(() => {
+      uppy.use(Transloadit, {
+        params: 'not json'
+      })
+    }).toThrowError(/The `params` option is a malformed JSON string/)
+
+    expect(() => {
+      uppy.use(Transloadit, {
+        params: '{"template_id":"some template id string"}'
+      })
+    }).toThrowError(/The `params\.auth\.key` option is required/)
+    expect(() => {
+      uppy.use(Transloadit, {
+        params: '{"auth":{"key":"some auth key string"},"template_id":"some template id string"}'
+      })
+    }).not.toThrowError(/The `params\.auth\.key` option is required/)
+  })
+
+  it('Validates response from getAssemblyOptions()', () => {
+    const uppy = new Core({ autoProceed: false })
+
+    uppy.use(Transloadit, {
+      getAssemblyOptions: (file) => {
+        expect(file.name).toBe('testfile')
+        return {
+          params: '{"some":"json"}'
+        }
+      }
+    })
+
+    const data = Buffer.alloc(4000)
+    data.size = data.byteLength
+    return uppy.addFile({
+      name: 'testfile',
+      data
+    }).then(() => {
+      return uppy.upload().then(() => {
+        throw new Error('should have rejected')
+      }, (err) => {
+        expect(err.message).toMatch(/The `params\.auth\.key` option is required/)
+      })
+    })
+  })
+
+  it('Uses different assemblies for different params', () => {
+    const uppy = new Core({ autoProceed: false })
+
+    uppy.use(Transloadit, {
+      getAssemblyOptions: (file) => ({
+        params: {
+          auth: { key: 'fake key' },
+          steps: {
+            fake_step: { data: file.name }
+          }
+        }
+      })
+    })
+
+    const tl = uppy.getPlugin('Transloadit')
+    const files = ['a.png', 'b.png', 'c.png', 'd.png']
+    let i = 0
+    tl.client.createAssembly = (opts) => {
+      expect(opts.params.steps.fake_step.data).toEqual(files[i])
+      i++
+      // Short-circuit upload
+      return Promise.reject('short-circuit') // eslint-disable-line prefer-promise-reject-errors
+    }
+
+    const data = Buffer.alloc(10)
+    data.size = data.byteLength
+
+    return Promise.all([
+      uppy.addFile({ name: 'a.png', data }),
+      uppy.addFile({ name: 'b.png', data }),
+      uppy.addFile({ name: 'c.png', data }),
+      uppy.addFile({ name: 'd.png', data })
+    ]).then(() => {
+      return uppy.upload().then(() => {
+        throw new Error('upload should have been rejected')
+      }, () => {
+        expect(i).toBe(4)
+      })
+    })
+  })
+
+  it('Should merge files with same parameters into one assembly', () => {
+    const uppy = new Core({ autoProceed: false })
+
+    uppy.use(Transloadit, {
+      getAssemblyOptions: (file) => ({
+        params: {
+          auth: { key: 'fake key' },
+          steps: {
+            fake_step: { data: file.size }
+          }
+        }
+      })
+    })
+
+    const tl = uppy.getPlugin('Transloadit')
+    const assemblies = [
+      { data: 10, files: ['a.png', 'b.png', 'c.png'] },
+      { data: 20, files: ['d.png'] }
+    ]
+    let i = 0
+    tl.client.createAssembly = (opts) => {
+      const assembly = assemblies[i]
+      expect(opts.params.steps.fake_step.data).toBe(assembly.data)
+      i++
+      // Short-circuit upload
+      return Promise.reject('short-circuit') // eslint-disable-line prefer-promise-reject-errors
+    }
+
+    const data = Buffer.alloc(10)
+    data.size = data.byteLength
+    const data2 = Buffer.alloc(20)
+    data2.size = data2.byteLength
+
+    return Promise.all([
+      uppy.addFile({ name: 'a.png', data }),
+      uppy.addFile({ name: 'b.png', data }),
+      uppy.addFile({ name: 'c.png', data }),
+      uppy.addFile({ name: 'd.png', data: data2 })
+    ]).then(() => {
+      return uppy.upload().then(() => {
+        throw new Error('Upload should have been rejected')
+      }, () => {
+        expect(i).toBe(2)
+      })
+    })
+  })
+
+  it('Does not create an assembly if no files are being uploaded', () => {
+    const uppy = new Core()
+    uppy.use(Transloadit, {
+      getAssemblyOptions () {
+        throw new Error('should not create assembly')
+      }
+    })
+    uppy.run()
+
+    return uppy.upload()
+  })
+
+  it('Creates an assembly if no files are being uploaded but `alwaysRunAssembly` is enabled', () => {
+    const uppy = new Core()
+    uppy.use(Transloadit, {
+      alwaysRunAssembly: true,
+      getAssemblyOptions (file) {
+        // should call getAssemblyOptions with `null`
+        expect(file).toBe(null)
+        return Promise.reject('short-circuited') // eslint-disable-line prefer-promise-reject-errors
+      }
+    })
+
+    return expect(uppy.upload()).rejects.toBe('short-circuited')
+  })
+})

From 2b9883d4bf166f89be7feb35e025cc4639ed4921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9e=20Kooi?= <renee@kooi.me>
Date: Mon, 20 Nov 2017 12:20:32 +0100
Subject: [PATCH 25/54] changelog: tick simultaneous upload limiting

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3684c5e5..7f367f89e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -95,7 +95,7 @@ Theme: 🎄 Christmas edition
 - [ ] core: Redux PR (#216 / @arturi, @goto-bus-stop, @richardwillars)
 - [ ] core: css-in-js, while keeping non-random classnames (ideally prefixed) and useful preprocessor features. also see simple https://github.com/codemirror/CodeMirror/blob/master/lib/codemirror.css (@arturi, @goto-bus-stop)
 - [ ] core: improve on Redux PR #216 to allow using Redux (or any other solution) for all Uppy state management, instead of proxy-only (@goto-bus-stop, @arturi)
-- [ ] core: limit amount of simultaneous uploads, queuing? #360 (@goto-bus-stop)
+- [x] core: limit amount of simultaneous uploads, queuing? #360 (#427 / @goto-bus-stop)
 - [ ] core: research !important styles to be immune to any environment/page. Maybe use smth like `postcss-safe-important`, http://cleanslatecss.com/ Or increase specificity (with .uppy prefix) (@arturi)
 - [ ] dashboard: allow minimizing the Dashboard during upload (Uppy then becomes just a tiny progress indicator) (@arturi)
 - [ ] dashboard: cancel button for any kind of uploads? currently resume/pause only for tus, and cancel for XHR (@arturi, @goto-bus-stop)

From 81eb51953d9780ae8f71a15a2f9117836ff36900 Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Mon, 20 Nov 2017 10:01:54 -0500
Subject: [PATCH 26/54] Use `this.el`, deprecate`this.target`

---
 src/plugins/Dashboard/index.js |  6 ++---
 src/plugins/DragDrop/index.js  | 45 +++++++++-------------------------
 src/plugins/Plugin.js          | 10 +++-----
 3 files changed, 18 insertions(+), 43 deletions(-)

diff --git a/src/plugins/Dashboard/index.js b/src/plugins/Dashboard/index.js
index 40d482da0..103210cfa 100644
--- a/src/plugins/Dashboard/index.js
+++ b/src/plugins/Dashboard/index.js
@@ -283,14 +283,14 @@ module.exports = class DashboardUI extends Plugin {
   }
 
   removeActions () {
-    window.removeEventListener('resize', this.updateDashboardElWidth)
-
     this.core.off('core:file-added', this.hideAllPanels)
     this.core.off('dashboard:file-card', this.handleFileCard)
+
+    window.removeEventListener('resize', this.updateDashboardElWidth)
   }
 
   updateDashboardElWidth () {
-    const dashboardEl = this.target.querySelector('.UppyDashboard-inner')
+    const dashboardEl = this.el.querySelector('.UppyDashboard-inner')
     this.core.log(`Dashboard width: ${dashboardEl.offsetWidth}`)
 
     this.setPluginState({
diff --git a/src/plugins/DragDrop/index.js b/src/plugins/DragDrop/index.js
index 59cf55e0c..249e05478 100644
--- a/src/plugins/DragDrop/index.js
+++ b/src/plugins/DragDrop/index.js
@@ -58,8 +58,9 @@ module.exports = class DragDrop extends Plugin {
 
     // Bind `this` to class methods
     this.handleDrop = this.handleDrop.bind(this)
+    this.onBrowseClick = this.onBrowseClick.bind(this)
+    this.onInputChange = this.onInputChange.bind(this)
     this.checkDragDropSupport = this.checkDragDropSupport.bind(this)
-    this.handleInputChange = this.handleInputChange.bind(this)
     this.render = this.render.bind(this)
   }
 
@@ -98,7 +99,7 @@ module.exports = class DragDrop extends Plugin {
     })
   }
 
-  handleInputChange (ev) {
+  onInputChange (ev) {
     this.core.log('[DragDrop] Files selected through input')
 
     const files = toArray(ev.target.files)
@@ -113,14 +114,12 @@ module.exports = class DragDrop extends Plugin {
     })
   }
 
+  onBrowseClick (ev) {
+    const input = this.target.querySelector('.uppy-DragDrop-input')
+    input.click()
+  }
+
   render (state) {
-    const onSelect = (ev) => {
-      const input = this.target.querySelector('.uppy-DragDrop-input')
-      input.click()
-    }
-
-    // const selectedFilesCount = Object.keys(state.files).length
-
     return html`
       <div class="Uppy UppyTheme--default uppy-DragDrop-container ${this.isDragDropSupported ? 'is-dragdrop-supported' : ''}"
            style="width: ${this.opts.width}; height: ${this.opts.height};">
@@ -133,8 +132,8 @@ module.exports = class DragDrop extends Plugin {
                  name="files[]"
                  multiple="true"
                  value=""
-                 onchange=${this.handleInputChange.bind(this)} />
-          <label class="uppy-DragDrop-label" onclick=${onSelect}>
+                 onchange=${this.onInputChange} />
+          <label class="uppy-DragDrop-label" onclick=${this.onBrowseClick}>
             ${this.i18n('dropHereOr')}
             <span class="uppy-DragDrop-dragText">${this.i18n('browse')}</span>
           </label>
@@ -144,36 +143,14 @@ module.exports = class DragDrop extends Plugin {
     `
   }
 
-  // ${selectedFilesCount > 0
-  // ? html`<div class="uppy-DragDrop-selectedCount">
-  //     ${this.i18n('selectedFiles', {'smart_count': selectedFilesCount})}
-  //   </div>`
-  // : ''}
-
   install () {
     const target = this.opts.target
     if (target) {
       this.mount(target, this)
     }
-  }
-
-  uninstall () {
-    this.unmount()
-  }
-
-  mount (...args) {
-    super.mount(...args)
-
-    const dndContainer = this.target.querySelector('.uppy-DragDrop-container')
-    this.removeDragDropListener = dragDrop(dndContainer, (files) => {
+    this.removeDragDropListener = dragDrop(this.el, (files) => {
       this.handleDrop(files)
       this.core.log(files)
     })
   }
-
-  unmount (...args) {
-    this.removeDragDropListener()
-
-    super.unmount(...args)
-  }
 }
diff --git a/src/plugins/Plugin.js b/src/plugins/Plugin.js
index 272546ee4..42cbf68e2 100644
--- a/src/plugins/Plugin.js
+++ b/src/plugins/Plugin.js
@@ -87,9 +87,7 @@ module.exports = class Plugin {
       this.el = plugin.render(this.core.state)
       targetElement.appendChild(this.el)
 
-      this.target = this.el
-
-      return this.target
+      return this.el
     }
 
     let targetPlugin
@@ -111,8 +109,8 @@ module.exports = class Plugin {
     if (targetPlugin) {
       const targetPluginName = targetPlugin.id
       this.core.log(`Installing ${callerPluginName} to ${targetPluginName}`)
-      this.target = targetPlugin.addTarget(plugin)
-      return this.target
+      this.el = targetPlugin.addTarget(plugin)
+      return this.el
     }
 
     this.core.log(`Not installing ${callerPluginName}`)
@@ -131,7 +129,7 @@ module.exports = class Plugin {
     if (this.el && this.el.parentNode) {
       this.el.parentNode.removeChild(this.el)
     }
-    this.target = null
+    // this.target = null
   }
 
   install () {

From 4b5f79b07ee5ef150f5267458ba7b627282c211f Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Mon, 20 Nov 2017 18:59:10 -0500
Subject: [PATCH 27/54] fix octocat

---
 website/themes/uppy/layout/layout.ejs       | 9 +--------
 website/themes/uppy/source/css/_common.scss | 6 ------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/website/themes/uppy/layout/layout.ejs b/website/themes/uppy/layout/layout.ejs
index 73599b759..d39c33c36 100644
--- a/website/themes/uppy/layout/layout.ejs
+++ b/website/themes/uppy/layout/layout.ejs
@@ -47,14 +47,7 @@
           </ul>
         </nav>
 
-        <a href="https://github.com/transloadit/uppy" class="github-corner" aria-label="View source on Github">
-          <svg width="70" height="70" viewBox="0 0 250 250" style="fill:#E0217D; color:#fff; position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true">
-            <path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path>
-            <path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path>
-            <path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path>
-          </svg>
-        </a>
-        <style></style>
+        <a href="https://github.com/transloadit/uppy" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="fill:#e02177; color:#fff; position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
       </header>
 
       <main class="MainContent js-MainContent" id="main">
diff --git a/website/themes/uppy/source/css/_common.scss b/website/themes/uppy/source/css/_common.scss
index c840bfcee..9ccb88ceb 100644
--- a/website/themes/uppy/source/css/_common.scss
+++ b/website/themes/uppy/source/css/_common.scss
@@ -342,12 +342,6 @@ a.button {
   }
 }
 
-/**
-* GitHub corner
-*/
-
-.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}
-
 /**
 * BuildBadge
 */

From f23f41810f1fbb48acc9bad7bebb4aafdd56ee29 Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Mon, 20 Nov 2017 19:31:40 -0500
Subject: [PATCH 28/54] fix this.target --> this.el

PR #425 aftermath
---
 src/plugins/Dashboard/index.js | 10 ++--------
 src/plugins/DragDrop/index.js  |  2 +-
 src/plugins/Plugin.js          |  7 ++++---
 src/plugins/Webcam/index.js    |  2 +-
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/plugins/Dashboard/index.js b/src/plugins/Dashboard/index.js
index 103210cfa..556abe7c2 100644
--- a/src/plugins/Dashboard/index.js
+++ b/src/plugins/Dashboard/index.js
@@ -136,7 +136,7 @@ module.exports = class DashboardUI extends Plugin {
       targets: newTargets
     })
 
-    return this.target
+    return this.el
   }
 
   hideAllPanels () {
@@ -157,10 +157,6 @@ module.exports = class DashboardUI extends Plugin {
     })
   }
 
-  // setModalElement (element) {
-  //   this.modal = element
-  // }
-
   requestCloseModal () {
     if (this.opts.onRequestCloseModal) {
       return this.opts.onRequestCloseModal()
@@ -170,7 +166,7 @@ module.exports = class DashboardUI extends Plugin {
   }
 
   getFocusableNodes () {
-    const nodes = this.modal.querySelectorAll(FOCUSABLE_ELEMENTS)
+    const nodes = this.el.querySelectorAll(FOCUSABLE_ELEMENTS)
     return Object.keys(nodes).map((key) => nodes[key])
   }
 
@@ -492,8 +488,6 @@ module.exports = class DashboardUI extends Plugin {
 
     this.initEvents()
     this.actions()
-
-    this.modal = document.querySelector('.UppyDashboard--modal')
   }
 
   uninstall () {
diff --git a/src/plugins/DragDrop/index.js b/src/plugins/DragDrop/index.js
index 249e05478..3876d1181 100644
--- a/src/plugins/DragDrop/index.js
+++ b/src/plugins/DragDrop/index.js
@@ -115,7 +115,7 @@ module.exports = class DragDrop extends Plugin {
   }
 
   onBrowseClick (ev) {
-    const input = this.target.querySelector('.uppy-DragDrop-input')
+    const input = this.el.querySelector('.uppy-DragDrop-input')
     input.click()
   }
 
diff --git a/src/plugins/Plugin.js b/src/plugins/Plugin.js
index 42cbf68e2..3df781c13 100644
--- a/src/plugins/Plugin.js
+++ b/src/plugins/Plugin.js
@@ -66,11 +66,12 @@ module.exports = class Plugin {
     // this.updateUI = nanoraf((state) => {
     //   this.el = yo.update(this.el, this.render(state))
     // })
-    this.updateUI = (state) => {
-      this.el = yo.update(this.el, this.render(state))
-    }
 
     if (targetElement) {
+      this.updateUI = (state) => {
+        this.el = yo.update(this.el, this.render(state))
+      }
+
       this.core.log(`Installing ${callerPluginName} to a DOM element`)
 
       // attempt to extract meta from form element
diff --git a/src/plugins/Webcam/index.js b/src/plugins/Webcam/index.js
index b8e2f9d8d..b11a60c07 100644
--- a/src/plugins/Webcam/index.js
+++ b/src/plugins/Webcam/index.js
@@ -191,7 +191,7 @@ module.exports = class Webcam extends Plugin {
   }
 
   getVideoElement () {
-    return this.target.querySelector('.UppyWebcam-video')
+    return this.el.querySelector('.UppyWebcam-video')
   }
 
   oneTwoThreeSmile () {

From 9a3b38fdf93337bc5718088ecb36a5258ba0e893 Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Mon, 20 Nov 2017 21:39:53 -0500
Subject: [PATCH 29/54] updateUI is only when target is a DOM element

---
 src/plugins/Plugin.test.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/Plugin.test.js b/src/plugins/Plugin.test.js
index b08729bda..d8cb7aafa 100644
--- a/src/plugins/Plugin.test.js
+++ b/src/plugins/Plugin.test.js
@@ -171,11 +171,6 @@ describe('Plugin', () => {
       expect(Plugin.prototype.mount.length).toBe(2)
     })
 
-    it('adds updateUI method', () => {
-      plugin.mount(mockTarget, mockPlugin)
-      expect(typeof plugin.updateUI).toBe('function')
-    })
-
     xit('sets `el` property when state has changed', () => {
       expect.assertions(4)
 
@@ -258,6 +253,11 @@ describe('Plugin', () => {
         expect(mockElement.appendChild.mock.calls[0][0]).toEqual({ el: 'lo' })
       })
 
+      it('adds updateUI method', () => {
+        plugin.mount(mockTarget, mockPlugin)
+        expect(typeof plugin.updateUI).toBe('function')
+      })
+
       it('returns the target DOM element', () => {
         plugin = new Plugin(mockCore)
         plugin.render = () => {}

From 46b53f52be73dc46da833b1409909216d824219b Mon Sep 17 00:00:00 2001
From: Dmytro Sadovnychyi <git@dmit.ro>
Date: Wed, 22 Nov 2017 14:40:15 +0800
Subject: [PATCH 30/54] Fix nanoraf

---
 src/plugins/Plugin.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/plugins/Plugin.js b/src/plugins/Plugin.js
index 7fcdf4a5a..7e2a47dfb 100644
--- a/src/plugins/Plugin.js
+++ b/src/plugins/Plugin.js
@@ -62,15 +62,11 @@ module.exports = class Plugin {
 
     const targetElement = findDOMElement(target)
 
-    // Set up nanoraf.
-    this.updateUI = nanoraf((state) => {
-      this.el = yo.update(this.el, this.render(state))
-    })
-
     if (targetElement) {
-      this.updateUI = (state) => {
+      // Set up nanoraf.
+      this.updateUI = nanoraf((state) => {
         this.el = yo.update(this.el, this.render(state))
-      }
+      })
 
       this.core.log(`Installing ${callerPluginName} to a DOM element`)
 

From 0e7505dcda86040a4663499532ecb6c0c41c8994 Mon Sep 17 00:00:00 2001
From: Dmytro Sadovnychyi <git@dmit.ro>
Date: Wed, 22 Nov 2017 14:43:13 +0800
Subject: [PATCH 31/54] Add tearDown method for provider view

---
 src/generic-provider-views/index.js | 9 ++++++---
 src/plugins/Dropbox/index.js        | 1 +
 src/plugins/GoogleDrive/index.js    | 1 +
 src/plugins/Instagram/index.js      | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/generic-provider-views/index.js b/src/generic-provider-views/index.js
index b0abafa96..6939e5fc3 100644
--- a/src/generic-provider-views/index.js
+++ b/src/generic-provider-views/index.js
@@ -53,6 +53,7 @@ module.exports = class View {
     this.opts = Object.assign({}, defaultOptions, opts)
 
     // Logic
+    this.updateFolderState = this.updateFolderState.bind(this)
     this.addFile = this.addFile.bind(this)
     this.filterItems = this.filterItems.bind(this)
     this.filterQuery = this.filterQuery.bind(this)
@@ -71,14 +72,16 @@ module.exports = class View {
     this.handleError = this.handleError.bind(this)
     this.handleScroll = this.handleScroll.bind(this)
 
-    this.plugin.core.on('core:file-removed', (fileId) => {
-      this.updateFolderState(fileId)
-    })
+    this.plugin.core.on('core:file-removed', this.updateFolderState)
 
     // Visual
     this.render = this.render.bind(this)
   }
 
+  tearDown () {
+    this.plugin.core.off('core:file-removed', this.updateFolderState)
+  }
+
   /**
    * Little shorthand to update the state with the plugin's state
    */
diff --git a/src/plugins/Dropbox/index.js b/src/plugins/Dropbox/index.js
index 6bb704245..a915ddd89 100644
--- a/src/plugins/Dropbox/index.js
+++ b/src/plugins/Dropbox/index.js
@@ -65,6 +65,7 @@ module.exports = class Dropbox extends Plugin {
   }
 
   uninstall () {
+    this.view.tearDown()
     this.unmount()
   }
 
diff --git a/src/plugins/GoogleDrive/index.js b/src/plugins/GoogleDrive/index.js
index c0067b36c..e85f3440f 100644
--- a/src/plugins/GoogleDrive/index.js
+++ b/src/plugins/GoogleDrive/index.js
@@ -63,6 +63,7 @@ module.exports = class GoogleDrive extends Plugin {
   }
 
   uninstall () {
+    this.view.tearDown()
     this.unmount()
   }
 
diff --git a/src/plugins/Instagram/index.js b/src/plugins/Instagram/index.js
index 40cbc7c85..7969c098a 100644
--- a/src/plugins/Instagram/index.js
+++ b/src/plugins/Instagram/index.js
@@ -69,6 +69,7 @@ module.exports = class Instagram extends Plugin {
   }
 
   uninstall () {
+    this.view.tearDown()
     this.unmount()
   }
 

From 268d8500f5dfb1573875cd65c3005279887352c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9e=20Kooi?= <renee@kooi.me>
Date: Wed, 22 Nov 2017 16:30:06 +0100
Subject: [PATCH 32/54] GoldenRetriever: Fix IndexedDB store initialisation
 when not cleaning up

We should be actually creating the connection right there.

This happened when using multiple instances, the first instance would
auto-cleanup and take the first path, while the second instance would
take this second path.
---
 src/plugins/GoldenRetriever/IndexedDBStore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/GoldenRetriever/IndexedDBStore.js b/src/plugins/GoldenRetriever/IndexedDBStore.js
index 0cb353aa7..49178c953 100644
--- a/src/plugins/GoldenRetriever/IndexedDBStore.js
+++ b/src/plugins/GoldenRetriever/IndexedDBStore.js
@@ -86,7 +86,7 @@ class IndexedDBStore {
       this.ready = IndexedDBStore.cleanup()
         .then(createConnection, createConnection)
     } else {
-      this.ready = createConnection
+      this.ready = createConnection()
     }
   }
 

From 6b4bc3a79805799d66cc882e897e0ff16c219abc Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Wed, 22 Nov 2017 21:10:45 -0500
Subject: [PATCH 33/54] remove IE6 test copy

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index e9d6d3455..a03d42cab 100644
--- a/README.md
+++ b/README.md
@@ -81,8 +81,8 @@ If you like, you can also use a pre-built bundle, for example from [unpkg CDN](h
 ``` html
 <script>
   var uppy = Uppy.Core()
-  uppy.use(Uppy.DragDrop, {target: '.UppyDragDrop'})
-  uppy.use(Uppy.Tus, {endpoint: '//master.tus.io/files/'})
+  uppy.use(Uppy.DragDrop, { target: '.UppyDragDrop' })
+  uppy.use(Uppy.Tus, { endpoint: '//master.tus.io/files/' })
   uppy.run()
 </script>
 ```
@@ -119,7 +119,7 @@ If you like, you can also use a pre-built bundle, for example from [unpkg CDN](h
   <img src="https://saucelabs.com/browser-matrix/transloadit-uppy.svg" alt="Sauce Test Status"/>
 </a>
 
-Note: we aim to support IE10+ and recent versions of Safari, Edge, Chrome, Firefox and Opera. IE6 on the chart above means we recommend setting Uppy to target a `<form>` element, so when Uppy has not yet loaded or is not supported, upload still works. Even on the refrigerator browser. Or, yes, IE6.
+Note: we aim to support IE10+ and recent versions of Safari, Edge, Chrome, Firefox and Opera.
 
 ## FAQ
 

From f7684d6f7589516ad1a1f28237ce67bba3f79c89 Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Wed, 22 Nov 2017 21:10:57 -0500
Subject: [PATCH 34/54] changelog

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3684c5e5..dbe478659 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -75,7 +75,7 @@ What we need to do to release Uppy 1.0
 - [ ] refactoring: reduce size where possible, like, socket.io --> websockets (saves 20KB)
 - [ ] refactoring: possibly add CSS-in-JS
 - [ ] refactoring: possibly switch from Yo-Yo to Preact, because it’s more stable, solves a few issues we are struggling with (onload being weird/hard/modern-browsers-only with bel; no way to pass refs to elements; extra network requests with base64 urls) and mature, “new standard”, larger community
-- [ ] refactoring: possibly differentiate UI plugins from logic plugins, so that, say uploading plugins don’t include rendering stuff
+- [ ] refactoring: possibly differentiate UI plugins from logic plugins, so that, say, uploading plugins don’t include rendering stuff
 - [x] refactoring: webcam plugin
 - [ ] docs: on using plugins, all options, list of plugins, i18n
 - [ ] uppy-server: better error handling, general cleanup (remove unused code. etc)
@@ -91,7 +91,7 @@ What we need to do to release Uppy 1.0
 To be released: 2017-12-20
 Theme: 🎄 Christmas edition
 
-- [ ] add `Form`: a plugin that is used in conjunction with any other acquirer, responsible for 1\. acquiring the metadata from form; 2\. intercepting submit event on the form, opening Uppy dialog instead; 3\. injecting any result (like from Transloadit plugin) back into the form (jquery-sdk includes the whole Assembly Status JSON in a hidden field i think) (@arturi)
+- [ ] add `Form`: a plugin that is used in conjunction with any other acquirer, responsible for 1. acquiring the metadata from form; 2. intercepting submit event on the form, opening Uppy dialog instead; 3. injecting any result (like from Transloadit plugin) back into the form (jquery-sdk includes the whole Assembly Status JSON in a hidden field i think) (@arturi)
 - [ ] core: Redux PR (#216 / @arturi, @goto-bus-stop, @richardwillars)
 - [ ] core: css-in-js, while keeping non-random classnames (ideally prefixed) and useful preprocessor features. also see simple https://github.com/codemirror/CodeMirror/blob/master/lib/codemirror.css (@arturi, @goto-bus-stop)
 - [ ] core: improve on Redux PR #216 to allow using Redux (or any other solution) for all Uppy state management, instead of proxy-only (@goto-bus-stop, @arturi)

From 0b4d662531ce3aebe3ae21ebf25836f821a82194 Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Wed, 22 Nov 2017 21:11:06 -0500
Subject: [PATCH 35/54] 0.21 post draft

---
 website/src/_posts/2017-10-0.21.md | 124 +++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)
 create mode 100644 website/src/_posts/2017-10-0.21.md

diff --git a/website/src/_posts/2017-10-0.21.md b/website/src/_posts/2017-10-0.21.md
new file mode 100644
index 000000000..652c1642f
--- /dev/null
+++ b/website/src/_posts/2017-10-0.21.md
@@ -0,0 +1,124 @@
+---
+title: "Uppy 0.21: End to End Tests, Accessibility, Additional Security for Uppy Server"
+date: 2017-11-24
+author: arturi
+published: false
+---
+
+Hi all! We’ve been busy with Halloween, but also another release, so here’s Uppy `0.21`! This one improves accessibility, features new end-to-end tests and improved security in Uppy Server.
+
+<!-- more -->
+
+## Accessibility
+
+One of the goals we’ve set out to achieve with Uppy was to make an accessibe file upload widget, and in this release we’ve achieved some more progress in this area. Dashboard modal dialog now handles focus better (it’s trapped inside the modal while open), first focusable element is in focus right after the modal dialog is open, more labels have been added, files from remote providers are now selectable with keyboard. 
+
+We plan to continue gradually improving in the accessibility area.
+
+See [#414 PR](https://github.com/transloadit/uppy/pull/414) for details.
+
+## Returning `{ successful, failed }` from `uppy.upload()`
+
+`uppy.upload()` promise now resolves to a `result` object with two arrays of files: `{ successful, failed }`. This lets you handle succesful and failed uploads in one go:  
+
+```js
+uppy.upload().then((result) => {
+  console.info('Successful uploads:', result.successful)
+  if (result.failed.length > 0) {
+    console.error('Errors:')
+    result.failed.forEach((file) => {
+      console.error(file.error)
+    })
+  }
+})
+
+// or
+
+uppy.on('core:complete', ({ successful, failed }) => {
+  if (failed.length === 0) {
+    console.log('UPLOAD SUCCESSFUL!!!')
+  } else {
+    console.warn('UPLOAD FAILED!!!')
+  }
+  console.log('successful files:', successful)
+  console.log('failed files:', failed)
+})
+```
+
+See [`uppy.upload()`](https://uppy.io/docs/uppy/#uppy-upload) and [`core:complete`](https://uppy.io/docs/uppy/#core-complete) in docs, as well as [#404 PR](https://github.com/transloadit/uppy/pull/404) for more details.
+
+
+## End to end tests
+
+We’ve refactored end to end tests to use [Webdriver.io](http://webdriver.io), and for the occasion added tests for Edge, Safari, Android and iOS. Now tests on Travis and Sauce Labs (thanks for the open source tier!) run smoothly and it’s easier to alter them or write new ones.
+
+## More secure Uppy Server
+
+We made sure access tokens from thrid-party providers, such as Google Drive or Instagram, are not stored on the server with Uppy Server, and kept in your browser instead. Then, when you want to pick a file from your Instagram, the token is used to make a request.
+
+While we were at this, we also made sure all sensitive data is masked in request logs.
+
+## Custom plugin `id`
+
+Up until now you could only use a plugin once with an Uppy instance. Now you can pass custom `id` for any plugin (though this has to be manually implemented in any new plugin). This allows using, for example, two `StatusBar`s, one inside the `Dashboard`, and one somewhere on the page, visible even when `Dashboard` is closed.
+
+Can be used like this:
+
+```js
+// one StatusBar comes included in the Dashboard, another will be mounted on the page
+.use(Dashboard {...})
+.use(StatusBar, { id: 'PageStatusBar', target: 'body' }
+```
+
+See [#418 PR](https://github.com/transloadit/uppy/pull/418) for details.
+
+## Misc good stuff
+
+- Migrated Dropbox in Uppy Server to use v2 API.
+- Fixed generating thumbnails for images with transparent background.
+- We are now using `tinyify` for the Uppy bundle to make it smaller and more efficient.
+- Instead of restarting only the file upload itself, start an entirely new upload for retries. Fixes retrying uploads with processing plugins.
+- S3 plugin now includes XHRUpload. **You should remove `.use(XHRUpload)` when using S3.**
+- XHRUpload now includes a timeout `opts.timeout = 30000`, after which it errors and offers a retry (retry UI supported in Dashboard), see [#378](https://github.com/transloadit/uppy/pull/378) for more.
+- Renamed `RestoreFiles` → `GoldenRetriever`, and `Tus10` → `Tus`, make sure and use new names when setting up plugins.
+- Webcam plugin has been refactored. There’s no flash fallback now, it works in modern browsers only, and it the Webcam tab won’t appear in the Dashboard if camera is not supported on the device.
+
+## Full Changelog
+
+Here is the full list of changes for version `0.21.0` (and patches `0.20.1`, `0.20.2`, `0.20.3`):
+
+- accessibility: add tabindex="0" to buttons and tabs, aria-labels, focus (#414 / @arturi)
+- core: allow setting custom `id` for plugins to allow a plugin to be used multiple times (#418 / @arturi)
+- core: do not check isPreviewSupported for unknown filetypes (#417 / @sadovnychyi)
+- core: refactor `uppy-base` (#382 / @goto-bus-stop)
+- core: remove functions from state object (#408 / @goto-bus-stop)
+- core: return `{ successful, failed }` from `uppy.upload()` (#404 / @goto-bus-stop)
+- core: update state with error messages rather than error objects (#406 / @richardwillars)
+- core: use `tinyify` for the unpkg bundle. (#371 / @goto-bus-stop)
+- dashboard: Fix pasting files, default `image` file name, add type to meta, file type refactor (#395 / @arturi)
+- dragdrop: Fix of the .uppy-DragDrop-inner spacing on small screens (#405 / @nqst)
+- react: fix `uppy` PropType, closes (#416 / @goto-bus-stop)
+- s3: automatically wrap XHRUpload. **Users should remove `.use(XHRUpload)` when using S3.** (#408 / @goto-bus-stop)
+- test: refactored end-to-end tests to not use website, switched to Webdriver.io, added tests for Edge, Safari, Android and iOS (#410 / @arturi)
+- tus: Rename Tus10 → Tus (#285 / @goto-bus-stop)
+- uppy-serer: mask sensitive data from request logs (@ifedapoolarewaju)
+- uppy-server: add request body validators (@ifedapoolarewaju)
+- uppy-server: migrate dropbox to use v2 API (#386 / @ifedapoolarewaju)
+- uppy-server: store tokens in user’s browser only (@ifedapoolarewaju)
+- webcam: only show the webcam tab when browser support is available (media recorder API) (#421 / @arturi, @goto-bus-stop)
+- webcam: simplify and refactor webcam plugin (modern browser APIs only) (#382 / @goto-bus-stop)
+- xhrupload: set a timeout in the onprogress event handler to detect stale network (#378 / @goto-bus-stop)
+- uppy-server: allow flexible whitelist endpoint protocols (@ifedapoolarewaju)
+- core: Start a completely new upload when retrying. (#390 / @goto-bus-stop)
+- dashboard: Show errors that occurred during processing on the file items. (#391 / @goto-bus-stop)
+- transloadit: Mark files as having errored if their assembly fails. (#392 / @goto-bus-stop)
+- core: Clear file upload progress when an upload starts. (#393 / @goto-bus-stop)
+- tus: Clean up `tus.Upload` instance and events when an upload starts, finishes, or fails. (#390 / @goto-bus-stop)
+- docs: fix `getMetaFromForm` documentation (@arturi)
+- core: fix generating thumbnails for images with transparent background (#380 / @goto-bus-stop)
+- transloadit: use Translator class for localised strings (#383 / @goto-bus-stop)
+- goldenretriever: don't crash when required server-side (#384 / @goto-bus-stop)
+- redux: add plugin for syncing uppy state with a Redux store (#376 / @richardwillars)
+
+
+The Uppy Team

From b4b261661934d51e9ac2fc4f7fb7649f4a12f069 Mon Sep 17 00:00:00 2001
From: Tim Koschuetzki <tim-kos@users.noreply.github.com>
Date: Thu, 23 Nov 2017 08:29:17 +0100
Subject: [PATCH 36/54] Round of typo fixes for the new Uppy release post.

---
 website/src/_posts/2017-10-0.21.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/website/src/_posts/2017-10-0.21.md b/website/src/_posts/2017-10-0.21.md
index 652c1642f..aba3549ce 100644
--- a/website/src/_posts/2017-10-0.21.md
+++ b/website/src/_posts/2017-10-0.21.md
@@ -5,7 +5,7 @@ author: arturi
 published: false
 ---
 
-Hi all! We’ve been busy with Halloween, but also another release, so here’s Uppy `0.21`! This one improves accessibility, features new end-to-end tests and improved security in Uppy Server.
+Hi all! We’ve been busy with Halloween, but also another release, so here is Uppy `0.21`! This one improves accessibility, features new end-to-end tests and improved security in Uppy Server.
 
 <!-- more -->
 
@@ -54,7 +54,7 @@ We’ve refactored end to end tests to use [Webdriver.io](http://webdriver.io),
 
 ## More secure Uppy Server
 
-We made sure access tokens from thrid-party providers, such as Google Drive or Instagram, are not stored on the server with Uppy Server, and kept in your browser instead. Then, when you want to pick a file from your Instagram, the token is used to make a request.
+We made sure access tokens from third-party providers, such as Google Drive or Instagram, are not stored on the server with Uppy Server, and kept in your browser instead. Then, when you want to pick a file from your Instagram, the token is used to make a request.
 
 While we were at this, we also made sure all sensitive data is masked in request logs.
 
@@ -78,10 +78,10 @@ See [#418 PR](https://github.com/transloadit/uppy/pull/418) for details.
 - Fixed generating thumbnails for images with transparent background.
 - We are now using `tinyify` for the Uppy bundle to make it smaller and more efficient.
 - Instead of restarting only the file upload itself, start an entirely new upload for retries. Fixes retrying uploads with processing plugins.
-- S3 plugin now includes XHRUpload. **You should remove `.use(XHRUpload)` when using S3.**
+- The S3 plugin now includes XHRUpload. **You should remove `.use(XHRUpload)` when using S3.**
 - XHRUpload now includes a timeout `opts.timeout = 30000`, after which it errors and offers a retry (retry UI supported in Dashboard), see [#378](https://github.com/transloadit/uppy/pull/378) for more.
-- Renamed `RestoreFiles` → `GoldenRetriever`, and `Tus10` → `Tus`, make sure and use new names when setting up plugins.
-- Webcam plugin has been refactored. There’s no flash fallback now, it works in modern browsers only, and it the Webcam tab won’t appear in the Dashboard if camera is not supported on the device.
+- Renamed `RestoreFiles` → `GoldenRetriever`, and `Tus10` → `Tus`. Please make sure to use the new names when setting up plugins.
+- The Webcam plugin has been refactored. There’s no flash fallback now, it works in modern browsers only, and the Webcam tab won’t appear in the Dashboard if a camera is not supported on the device.
 
 ## Full Changelog
 

From ffbcfdc92105a990fbf6608cb5b357e0ca7aa21f Mon Sep 17 00:00:00 2001
From: Dmytro Sadovnychyi <git@dmit.ro>
Date: Thu, 23 Nov 2017 16:16:04 +0800
Subject: [PATCH 37/54] Add some docs for new methods

---
 src/generic-provider-views/index.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/generic-provider-views/index.js b/src/generic-provider-views/index.js
index 6939e5fc3..95c0c1afe 100644
--- a/src/generic-provider-views/index.js
+++ b/src/generic-provider-views/index.js
@@ -334,6 +334,12 @@ module.exports = class View {
     return (itemId in this.plugin.core.getState().files)
   }
 
+  /**
+   * Adds all files found inside of specified folder.
+   *
+   * Uses separated state while folder contents are being fetched and
+   * mantains list of selected folders, which are separated from files.
+   */
   addFolder (folder) {
     const folderId = this.providerFileToId(folder)
     let state = this.plugin.core.getState()[this.plugin.stateId]
@@ -391,6 +397,13 @@ module.exports = class View {
     this.updateState({selectedFolders: folders})
   }
 
+  /**
+   * Updates selected folders state everytime file is being removed.
+   *
+   * Note that this is only important when files are getting removed from the
+   * main screen, and will do nothing when you uncheck folder directly, since
+   * it's already been done in removeFolder method.
+   */
   updateFolderState (fileId) {
     let state = this.plugin.core.getState()[this.plugin.stateId]
     let folders = state.selectedFolders || {}
@@ -410,6 +423,14 @@ module.exports = class View {
     this.updateState({selectedFolders: folders})
   }
 
+  /**
+   * Toggles file/folder checkbox to on/off state while updating files list.
+   *
+   * Note that some extra complexity comes from supporting shift+click to
+   * toggle multiple checkboxes at once, which is done by getting all files
+   * in between last checked file and current one, and applying an on/off state
+   * for all of them, depending on current file state.
+   */
   toggleCheckbox (e, file) {
     e.stopPropagation()
     e.preventDefault()

From 7a155bb6bf53fdc795bbb969e311b6f9eb1c4c69 Mon Sep 17 00:00:00 2001
From: Richard Willars <richard@richardwillars.com>
Date: Thu, 23 Nov 2017 13:56:23 +0000
Subject: [PATCH 38/54] Adds ability to disable thumbnail generation using
 thumbnailGeneration option

---
 src/core/Core.js       |  5 +++--
 src/core/Core.test.js  | 28 ++++++++++++++++++++++++++++
 src/core/Utils.js      |  5 ++++-
 src/core/Utils.test.js | 22 ++++++++++++++++++++++
 4 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/src/core/Core.js b/src/core/Core.js
index e0520931c..265f1df93 100644
--- a/src/core/Core.js
+++ b/src/core/Core.js
@@ -45,7 +45,8 @@ class Uppy {
       meta: {},
       onBeforeFileAdded: (currentFile, files) => Promise.resolve(),
       onBeforeUpload: (files, done) => Promise.resolve(),
-      locale: defaultLocale
+      locale: defaultLocale,
+      thumbnailGeneration: true
     }
 
     // Merge default options with the ones set by user
@@ -394,7 +395,7 @@ class Uppy {
    */
   generatePreview (file) {
     if (Utils.isPreviewSupported(file.type) && !file.isRemote) {
-      Utils.createThumbnail(file, 200).then((thumbnail) => {
+      Utils.createThumbnail(file, 200, this.opts.thumbnailGeneration).then((thumbnail) => {
         this.setPreviewURL(file.id, thumbnail)
       }).catch((err) => {
         console.warn(err.stack || err.message)
diff --git a/src/core/Core.test.js b/src/core/Core.test.js
index 382807d69..047c680e2 100644
--- a/src/core/Core.test.js
+++ b/src/core/Core.test.js
@@ -18,6 +18,7 @@ describe('src/Core', () => {
     jest.spyOn(utils, 'createThumbnail').mockImplementation(path => {
       return Promise.resolve(sampleImageDataURI)
     })
+    utils.createThumbnail.mockClear()
   })
 
   it('should expose a class', () => {
@@ -589,6 +590,33 @@ describe('src/Core', () => {
         data: null
       })).rejects.toMatchObject({ message: 'onBeforeFileAdded: a plain string' })
     })
+
+    it('should call utils.generatePreview when core:file-added is triggered', () => {
+      const core = new Core({
+      }).run()
+      const file = {
+        type: 'image/jpeg',
+        isRemote: false
+      }
+      core.emit('core:file-added', file)
+      expect(utils.createThumbnail).toHaveBeenCalledOnce
+      expect(utils.createThumbnail.mock.calls[0][1]).toEqual(200)
+      expect(utils.createThumbnail.mock.calls[0][2]).toEqual(true)
+    })
+
+    it('should call utils.generatePreview when core:file-added is triggered, but the thumbnail generation should be bypassed when specified by the config', () => {
+      const core = new Core({
+        thumbnailGeneration: false
+      }).run()
+      const file = {
+        type: 'image/jpeg',
+        isRemote: false
+      }
+      core.emit('core:file-added', file)
+      expect(utils.createThumbnail).toHaveBeenCalledOnce
+      expect(utils.createThumbnail.mock.calls[0][1]).toEqual(200)
+      expect(utils.createThumbnail.mock.calls[0][2]).toEqual(false)
+    })
   })
 
   describe('uploading a file', () => {
diff --git a/src/core/Utils.js b/src/core/Utils.js
index eba412400..48fb20584 100644
--- a/src/core/Utils.js
+++ b/src/core/Utils.js
@@ -215,8 +215,11 @@ function getProportionalHeight (img, width) {
  * @param {number} width
  * @return {Promise}
  */
-function createThumbnail (file, targetWidth) {
+function createThumbnail (file, targetWidth, shouldGenerateThumbnail) {
   const originalUrl = URL.createObjectURL(file.data)
+  if (shouldGenerateThumbnail === false) {
+    return Promise.resolve(originalUrl)
+  }
 
   const onload = new Promise((resolve, reject) => {
     const image = new Image()
diff --git a/src/core/Utils.test.js b/src/core/Utils.test.js
index 3269baf30..49e0d759d 100644
--- a/src/core/Utils.test.js
+++ b/src/core/Utils.test.js
@@ -261,10 +261,32 @@ describe('core/utils', () => {
   })
 
   describe('createThumbnail', () => {
+    const RealCreateObjectUrl = global.URL.createObjectURL
+
+    beforeEach(() => {
+      global.URL.createObjectURL = jest.fn().mockReturnValue('newUrl')
+    })
+
+    afterEach(() => {
+      global.URL.createObjectURL = RealCreateObjectUrl
+    })
+
     xit(
       'should create a thumbnail of the specified image at the specified width',
       () => {}
     )
+    it(
+      'should bypass the creation of a thumbnail when the generateThumbnail param is false',
+      () => {
+        const file = {
+          data: 'foobar'
+        }
+        const targetWidth = 200
+        return utils.createThumbnail(file, targetWidth, false).then((url) => {
+          expect(url).toEqual('newUrl')
+        })
+      }
+    )
   })
 
   describe('dataURItoBlob', () => {

From 2a52b922550851826a81af92ccd269b87da66281 Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Thu, 23 Nov 2017 13:46:06 -0500
Subject: [PATCH 39/54] =?UTF-8?q?add=20=E2=9A=A0=EF=B8=8F=20breaking=20cha?=
 =?UTF-8?q?nges?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 website/src/_posts/2017-10-0.21.md | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/website/src/_posts/2017-10-0.21.md b/website/src/_posts/2017-10-0.21.md
index aba3549ce..b5cc2515e 100644
--- a/website/src/_posts/2017-10-0.21.md
+++ b/website/src/_posts/2017-10-0.21.md
@@ -19,6 +19,8 @@ See [#414 PR](https://github.com/transloadit/uppy/pull/414) for details.
 
 ## Returning `{ successful, failed }` from `uppy.upload()`
 
+**⚠️ Breaking change**
+
 `uppy.upload()` promise now resolves to a `result` object with two arrays of files: `{ successful, failed }`. This lets you handle succesful and failed uploads in one go:  
 
 ```js
@@ -47,7 +49,6 @@ uppy.on('core:complete', ({ successful, failed }) => {
 
 See [`uppy.upload()`](https://uppy.io/docs/uppy/#uppy-upload) and [`core:complete`](https://uppy.io/docs/uppy/#core-complete) in docs, as well as [#404 PR](https://github.com/transloadit/uppy/pull/404) for more details.
 
-
 ## End to end tests
 
 We’ve refactored end to end tests to use [Webdriver.io](http://webdriver.io), and for the occasion added tests for Edge, Safari, Android and iOS. Now tests on Travis and Sauce Labs (thanks for the open source tier!) run smoothly and it’s easier to alter them or write new ones.
@@ -56,9 +57,9 @@ We’ve refactored end to end tests to use [Webdriver.io](http://webdriver.io),
 
 We made sure access tokens from third-party providers, such as Google Drive or Instagram, are not stored on the server with Uppy Server, and kept in your browser instead. Then, when you want to pick a file from your Instagram, the token is used to make a request.
 
-While we were at this, we also made sure all sensitive data is masked in request logs.
+And, while we were at this, we also made sure all sensitive data is masked in request logs.
 
-## Custom plugin `id`
+## Custom plugin id
 
 Up until now you could only use a plugin once with an Uppy instance. Now you can pass custom `id` for any plugin (though this has to be manually implemented in any new plugin). This allows using, for example, two `StatusBar`s, one inside the `Dashboard`, and one somewhere on the page, visible even when `Dashboard` is closed.
 
@@ -76,11 +77,11 @@ See [#418 PR](https://github.com/transloadit/uppy/pull/418) for details.
 
 - Migrated Dropbox in Uppy Server to use v2 API.
 - Fixed generating thumbnails for images with transparent background.
-- We are now using `tinyify` for the Uppy bundle to make it smaller and more efficient.
+- We are now using [`tinyify`](https://github.com/goto-bus-stop/tinyify)(by our own [@goto-bus-stop](https://github.com/goto-bus-stop)) for the Uppy bundle to make it smaller and more efficient.
 - Instead of restarting only the file upload itself, start an entirely new upload for retries. Fixes retrying uploads with processing plugins.
-- The S3 plugin now includes XHRUpload. **You should remove `.use(XHRUpload)` when using S3.**
+- The S3 plugin now includes XHRUpload. **⚠️ Breaking change: you should remove `.use(XHRUpload)` when using S3.**
 - XHRUpload now includes a timeout `opts.timeout = 30000`, after which it errors and offers a retry (retry UI supported in Dashboard), see [#378](https://github.com/transloadit/uppy/pull/378) for more.
-- Renamed `RestoreFiles` → `GoldenRetriever`, and `Tus10` → `Tus`. Please make sure to use the new names when setting up plugins.
+- Renamed `RestoreFiles` → `GoldenRetriever`, and `Tus10` → `Tus`. **⚠️ Breaking change: please make sure to use the new names when setting up plugins**.
 - The Webcam plugin has been refactored. There’s no flash fallback now, it works in modern browsers only, and the Webcam tab won’t appear in the Dashboard if a camera is not supported on the device.
 
 ## Full Changelog
@@ -98,7 +99,7 @@ Here is the full list of changes for version `0.21.0` (and patches `0.20.1`, `0.
 - dashboard: Fix pasting files, default `image` file name, add type to meta, file type refactor (#395 / @arturi)
 - dragdrop: Fix of the .uppy-DragDrop-inner spacing on small screens (#405 / @nqst)
 - react: fix `uppy` PropType, closes (#416 / @goto-bus-stop)
-- s3: automatically wrap XHRUpload. **Users should remove `.use(XHRUpload)` when using S3.** (#408 / @goto-bus-stop)
+- s3: automatically wrap XHRUpload. Users should remove `.use(XHRUpload)` when using S3. (#408 / @goto-bus-stop)
 - test: refactored end-to-end tests to not use website, switched to Webdriver.io, added tests for Edge, Safari, Android and iOS (#410 / @arturi)
 - tus: Rename Tus10 → Tus (#285 / @goto-bus-stop)
 - uppy-serer: mask sensitive data from request logs (@ifedapoolarewaju)

From df0b61972ded722be75b23bf1f815c31e2d97880 Mon Sep 17 00:00:00 2001
From: "Ifedapo .A. Olarewaju" <ifedapoolarewaju@gmail.com>
Date: Fri, 24 Nov 2017 08:17:35 +0100
Subject: [PATCH 40/54] add some more uppy-server details blog post

---
 website/src/_posts/2017-10-0.21.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/website/src/_posts/2017-10-0.21.md b/website/src/_posts/2017-10-0.21.md
index b5cc2515e..4cdf6e1a4 100644
--- a/website/src/_posts/2017-10-0.21.md
+++ b/website/src/_posts/2017-10-0.21.md
@@ -55,10 +55,16 @@ We’ve refactored end to end tests to use [Webdriver.io](http://webdriver.io),
 
 ## More secure Uppy Server
 
-We made sure access tokens from third-party providers, such as Google Drive or Instagram, are not stored on the server with Uppy Server, and kept in your browser instead. Then, when you want to pick a file from your Instagram, the token is used to make a request.
+We made sure access tokens from third-party providers, such as Google Drive or Instagram, are not stored on the server with Uppy Server, and kept in your browser instead. Then, when you want to pick a file from your Instagram, the token is used to make a request. Even though they live on the browser, these tokens are encrypted with JWT on the server side, before they are being sent to the client. So they can only be decrypted and understood on the server side.
+
+Data validation is also now done during intiation of an upload, to prevent corrupt data from triggering funny behaviours on the server. :)
 
 And, while we were at this, we also made sure all sensitive data is masked in request logs.
 
+## Migration to Dropbox v2 API
+
+Since the [deprecation of Dropbox v1 API](https://blogs.dropbox.com/developers/2017/09/api-v1-shutdown-details/), uppy/uppy-server have now been updated to use the v2 API. It is implemented to work closely as its previous implementation so there should be no worries.
+
 ## Custom plugin id
 
 Up until now you could only use a plugin once with an Uppy instance. Now you can pass custom `id` for any plugin (though this has to be manually implemented in any new plugin). This allows using, for example, two `StatusBar`s, one inside the `Dashboard`, and one somewhere on the page, visible even when `Dashboard` is closed.

From f4e754da6179d7c9edbf073ecd27fde633a779fe Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Fri, 24 Nov 2017 14:18:52 -0500
Subject: [PATCH 41/54] publish 0.21 post

---
 website/src/_posts/2017-10-0.21.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/website/src/_posts/2017-10-0.21.md b/website/src/_posts/2017-10-0.21.md
index 4cdf6e1a4..5248ca8db 100644
--- a/website/src/_posts/2017-10-0.21.md
+++ b/website/src/_posts/2017-10-0.21.md
@@ -2,7 +2,7 @@
 title: "Uppy 0.21: End to End Tests, Accessibility, Additional Security for Uppy Server"
 date: 2017-11-24
 author: arturi
-published: false
+published: true
 ---
 
 Hi all! We’ve been busy with Halloween, but also another release, so here is Uppy `0.21`! This one improves accessibility, features new end-to-end tests and improved security in Uppy Server.
@@ -11,7 +11,12 @@ Hi all! We’ve been busy with Halloween, but also another release, so here is U
 
 ## Accessibility
 
-One of the goals we’ve set out to achieve with Uppy was to make an accessibe file upload widget, and in this release we’ve achieved some more progress in this area. Dashboard modal dialog now handles focus better (it’s trapped inside the modal while open), first focusable element is in focus right after the modal dialog is open, more labels have been added, files from remote providers are now selectable with keyboard. 
+One of the goals we’ve set out to achieve with Uppy was to make an accessibe file upload widget, and in this release we’ve achieved some more progress in this area:
+
+* Dashboard modal dialog now handles focus better (it’s trapped inside the modal while open);
+* First button is in focus right after the modal dialog is open;
+* More (aria-)labels have been added;
+* Files from remote providers are now selectable with a keyboard.
 
 We plan to continue gradually improving in the accessibility area.
 

From 863e2f1e09a8e9d382e04f1bfc9014606075e882 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9e=20Kooi?= <renee@kooi.me>
Date: Mon, 27 Nov 2017 19:08:17 +0100
Subject: [PATCH 42/54] xhrupload: more procedural

---
 src/plugins/XHRUpload.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/plugins/XHRUpload.js b/src/plugins/XHRUpload.js
index 3e3604374..ed7d7280e 100644
--- a/src/plugins/XHRUpload.js
+++ b/src/plugins/XHRUpload.js
@@ -270,9 +270,10 @@ module.exports = class XHRUpload extends Plugin {
       }
     })
 
-    const promises = actions
-      .map(this.limitUploads)
-      .map((action) => action())
+    const promises = actions.map((action) => {
+      const limitedAction = this.limitUploads(action)
+      return limitedAction()
+    })
 
     return settle(promises)
   }

From 6777c816eb43025c46a1e44ee38845bf008df568 Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Mon, 27 Nov 2017 15:14:29 -0500
Subject: [PATCH 43/54] close dashboard tab after webcam capture

---
 src/plugins/Webcam/index.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/plugins/Webcam/index.js b/src/plugins/Webcam/index.js
index b11a60c07..3de65b188 100644
--- a/src/plugins/Webcam/index.js
+++ b/src/plugins/Webcam/index.js
@@ -124,6 +124,7 @@ module.exports = class Webcam extends Plugin {
     return this.mediaDevices.getUserMedia(constraints)
       .then((stream) => {
         this.stream = stream
+        console.log(stream)
         this.streamSrc = URL.createObjectURL(this.stream)
         this.setPluginState({
           cameraReady: true
@@ -230,6 +231,8 @@ module.exports = class Webcam extends Plugin {
     }).then((tagFile) => {
       this.captureInProgress = false
       this.core.addFile(tagFile)
+      const dashboard = this.core.getPlugin('Dashboard')
+      if (dashboard) dashboard.hideAllPanels()
     }, (error) => {
       this.captureInProgress = false
       throw error

From 8d89bb587c27f53e5533444e476120c2251c0d43 Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Mon, 27 Nov 2017 15:51:50 -0500
Subject: [PATCH 44/54] changelog

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbe478659..95795b000 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -99,14 +99,15 @@ Theme: 🎄 Christmas edition
 - [ ] core: research !important styles to be immune to any environment/page. Maybe use smth like `postcss-safe-important`, http://cleanslatecss.com/ Or increase specificity (with .uppy prefix) (@arturi)
 - [ ] dashboard: allow minimizing the Dashboard during upload (Uppy then becomes just a tiny progress indicator) (@arturi)
 - [ ] dashboard: cancel button for any kind of uploads? currently resume/pause only for tus, and cancel for XHR (@arturi, @goto-bus-stop)
-- [ ] dashboard: place upload button into StatusBar, use Alex’s suggestions for retry
+- [ ] dashboard: place upload button into StatusBar, use Alex’s suggestions for retry button
 - [ ] docs: quick start guide: https://community.transloadit.com/t/quick-start-guide-would-be-really-helpful/14605 (@arturi)
-- [ ] docs: writing plugins
+- [ ] docs: on writing plugins
 - [ ] goldenretriever: add “ghost” files (@arturi)
 - [ ] provider: improve UI, add icons for file types (@arturi)
 - [ ] test: add https://github.com/pa11y/pa11y for automated accessibility testing?
 - [ ] test: add tests for `npm pack`
 - [ ] tus: Review “tus: Remove old upload and events when starting a new upload.” b3cc48130e292f08c2a09f2f0adf6b6332bf7692 (@arturi)
+- [ ] webcam: URL.createObjectURL(MediaStream) is deprecated and will be removed soon: https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement/srcObject
 
 ## 0.21.0
 

From 6fcab8e9cbd56a6c34c40cb70502bdcb94c883eb Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Mon, 27 Nov 2017 16:10:30 -0500
Subject: [PATCH 45/54] use setPluginState and getPluginState

---
 src/generic-provider-views/index.js | 86 +++++++++++++----------------
 src/plugins/DragDrop/index.js       |  4 --
 src/plugins/Dropbox/index.js        | 27 ++++-----
 src/plugins/GoogleDrive/index.js    | 25 ++++-----
 src/plugins/Instagram/index.js      | 31 ++++-------
 5 files changed, 71 insertions(+), 102 deletions(-)

diff --git a/src/generic-provider-views/index.js b/src/generic-provider-views/index.js
index 95c0c1afe..82ca366b2 100644
--- a/src/generic-provider-views/index.js
+++ b/src/generic-provider-views/index.js
@@ -82,16 +82,6 @@ module.exports = class View {
     this.plugin.core.off('core:file-removed', this.updateFolderState)
   }
 
-  /**
-   * Little shorthand to update the state with the plugin's state
-   */
-  updateState (newState) {
-    let stateId = this.plugin.stateId
-    const {state} = this.plugin.core
-
-    this.plugin.core.setState({[stateId]: Object.assign({}, state[stateId], newState)})
-  }
-
   _updateFilesAndFolders (res, files, folders) {
     this.plugin.getItemSubList(res).forEach((item) => {
       if (this.plugin.isFolder(item)) {
@@ -101,18 +91,18 @@ module.exports = class View {
       }
     })
 
-    this.updateState({ folders, files })
+    this.plugin.setPluginState({ folders, files })
   }
 
   checkAuth () {
-    this.updateState({ checkAuthInProgress: true })
+    this.plugin.setPluginState({ checkAuthInProgress: true })
     this.Provider.checkAuth()
       .then((authenticated) => {
-        this.updateState({ checkAuthInProgress: false })
+        this.plugin.setPluginState({ checkAuthInProgress: false })
         this.plugin.onAuth(authenticated)
       })
       .catch((err) => {
-        this.updateState({ checkAuthInProgress: false })
+        this.plugin.setPluginState({ checkAuthInProgress: false })
         this.handleError(err)
       })
   }
@@ -130,7 +120,7 @@ module.exports = class View {
         let files = []
         let updatedDirectories
 
-        const state = this.plugin.core.getState()[this.plugin.stateId]
+        const state = this.plugin.getPluginState()
         const index = state.directories.findIndex((dir) => id === dir.id)
 
         if (index !== -1) {
@@ -140,7 +130,7 @@ module.exports = class View {
         }
 
         this._updateFilesAndFolders(res, files, folders)
-        this.updateState({ directories: updatedDirectories })
+        this.plugin.setPluginState({ directories: updatedDirectories })
       },
       this.handleError)
   }
@@ -201,23 +191,23 @@ module.exports = class View {
             folders: [],
             directories: []
           }
-          this.updateState(newState)
+          this.plugin.setPluginState(newState)
         }
       }).catch(this.handleError)
   }
 
   filterQuery (e) {
-    const state = this.plugin.core.getState()[this.plugin.stateId]
-    this.updateState(Object.assign({}, state, {
+    const state = this.plugin.getPluginState()
+    this.plugin.setPluginState(Object.assign({}, state, {
       filterInput: e.target.value
     }))
   }
 
   toggleSearch () {
-    const state = this.plugin.core.getState()[this.plugin.stateId]
+    const state = this.plugin.getPluginState()
     const searchInputEl = document.querySelector('.Browser-searchInput')
 
-    this.updateState(Object.assign({}, state, {
+    this.plugin.setPluginState(Object.assign({}, state, {
       isSearchVisible: !state.isSearchVisible,
       filterInput: ''
     }))
@@ -229,14 +219,14 @@ module.exports = class View {
   }
 
   filterItems (items) {
-    const state = this.plugin.core.getState()[this.plugin.stateId]
+    const state = this.plugin.getPluginState()
     return items.filter((folder) => {
       return this.plugin.getItemName(folder).toLowerCase().indexOf(state.filterInput.toLowerCase()) !== -1
     })
   }
 
   sortByTitle () {
-    const state = Object.assign({}, this.plugin.core.getState()[this.plugin.stateId])
+    const state = Object.assign({}, this.plugin.getPluginState())
     const {files, folders, sorting} = state
 
     let sortedFiles = files.sort((fileA, fileB) => {
@@ -253,7 +243,7 @@ module.exports = class View {
       return this.plugin.getItemName(folderA).localeCompare(this.plugin.getItemName(folderB))
     })
 
-    this.updateState(Object.assign({}, state, {
+    this.plugin.setPluginState(Object.assign({}, state, {
       files: sortedFiles,
       folders: sortedFolders,
       sorting: (sorting === 'titleDescending') ? 'titleAscending' : 'titleDescending'
@@ -261,7 +251,7 @@ module.exports = class View {
   }
 
   sortByDate () {
-    const state = Object.assign({}, this.plugin.core.getState()[this.plugin.stateId])
+    const state = Object.assign({}, this.plugin.getPluginState())
     const {files, folders, sorting} = state
 
     let sortedFiles = files.sort((fileA, fileB) => {
@@ -285,7 +275,7 @@ module.exports = class View {
       return a > b ? 1 : a < b ? -1 : 0
     })
 
-    this.updateState(Object.assign({}, state, {
+    this.plugin.setPluginState(Object.assign({}, state, {
       files: sortedFiles,
       folders: sortedFolders,
       sorting: (sorting === 'dateDescending') ? 'dateAscending' : 'dateDescending'
@@ -293,7 +283,7 @@ module.exports = class View {
   }
 
   sortBySize () {
-    const state = Object.assign({}, this.plugin.core.getState()[this.plugin.stateId])
+    const state = Object.assign({}, this.plugin.getPluginState())
     const {files, sorting} = state
 
     // check that plugin supports file sizes
@@ -311,20 +301,20 @@ module.exports = class View {
       return a > b ? 1 : a < b ? -1 : 0
     })
 
-    this.updateState(Object.assign({}, state, {
+    this.plugin.setPluginState(Object.assign({}, state, {
       files: sortedFiles,
       sorting: (sorting === 'sizeDescending') ? 'sizeAscending' : 'sizeDescending'
     }))
   }
 
   isActiveRow (file) {
-    return this.plugin.core.getState()[this.plugin.stateId].activeRow === this.plugin.getItemId(file)
+    return this.plugin.getPluginState().activeRow === this.plugin.getItemId(file)
   }
 
   isChecked (item) {
     const itemId = this.providerFileToId(item)
     if (this.plugin.isFolder(item)) {
-      const state = this.plugin.core.getState()[this.plugin.stateId]
+      const state = this.plugin.getPluginState()
       const folders = state.selectedFolders || {}
       if (itemId in folders) {
         return folders[itemId]
@@ -342,13 +332,13 @@ module.exports = class View {
    */
   addFolder (folder) {
     const folderId = this.providerFileToId(folder)
-    let state = this.plugin.core.getState()[this.plugin.stateId]
+    let state = this.plugin.getPluginState()
     let folders = state.selectedFolders || {}
     if (folderId in folders && folders[folderId].loading) {
       return
     }
     folders[folderId] = {loading: true, files: []}
-    this.updateState({selectedFolders: folders})
+    this.plugin.setPluginState({selectedFolders: folders})
     this.Provider.list(this.plugin.getItemRequestPath(folder)).then((res) => {
       let files = []
       this.plugin.getItemSubList(res).forEach((item) => {
@@ -357,9 +347,9 @@ module.exports = class View {
           files.push(this.providerFileToId(item))
         }
       })
-      state = this.plugin.core.getState()[this.plugin.stateId]
+      state = this.plugin.getPluginState()
       state.selectedFolders[folderId] = {loading: false, files: files}
-      this.updateState({selectedFolders: folders})
+      this.plugin.setPluginState({selectedFolders: folders})
       const dashboard = this.plugin.core.getPlugin('Dashboard')
       let message
       if (files.length) {
@@ -371,15 +361,15 @@ module.exports = class View {
       }
       this.plugin.core.info(message)
     }).catch((e) => {
-      state = this.plugin.core.getState()[this.plugin.stateId]
+      state = this.plugin.getPluginState()
       delete state.selectedFolders[folderId]
-      this.updateState({selectedFolders: state.selectedFolders})
+      this.plugin.setPluginState({selectedFolders: state.selectedFolders})
       this.handleError(e)
     })
   }
 
   removeFolder (folderId) {
-    let state = this.plugin.core.getState()[this.plugin.stateId]
+    let state = this.plugin.getPluginState()
     let folders = state.selectedFolders || {}
     if (!(folderId in folders)) {
       return
@@ -394,7 +384,7 @@ module.exports = class View {
       }
     }
     delete folders[folderId]
-    this.updateState({selectedFolders: folders})
+    this.plugin.setPluginState({selectedFolders: folders})
   }
 
   /**
@@ -405,7 +395,7 @@ module.exports = class View {
    * it's already been done in removeFolder method.
    */
   updateFolderState (fileId) {
-    let state = this.plugin.core.getState()[this.plugin.stateId]
+    let state = this.plugin.getPluginState()
     let folders = state.selectedFolders || {}
     for (let folderId in folders) {
       let folder = folders[folderId]
@@ -420,7 +410,7 @@ module.exports = class View {
         delete folders[folderId]
       }
     }
-    this.updateState({selectedFolders: folders})
+    this.plugin.setPluginState({selectedFolders: folders})
   }
 
   /**
@@ -434,7 +424,7 @@ module.exports = class View {
   toggleCheckbox (e, file) {
     e.stopPropagation()
     e.preventDefault()
-    let {folders, files, filterInput} = this.plugin.core.getState()[this.plugin.stateId]
+    let { folders, files, filterInput } = this.plugin.getPluginState()
     let items = folders.concat(files)
     if (filterInput !== '') {
       items = this.filterItems(items)
@@ -481,8 +471,8 @@ module.exports = class View {
   }
 
   handleDemoAuth () {
-    const state = this.plugin.core.getState()[this.plugin.stateId]
-    this.updateState({}, state, {
+    const state = this.plugin.getPluginState()
+    this.plugin.setPluginState({}, state, {
       authenticated: true
     })
   }
@@ -532,7 +522,7 @@ module.exports = class View {
     if (scrollPos < 50 && path && !this._isHandlingScroll) {
       this.Provider.list(path)
         .then((res) => {
-          const { files, folders } = this.plugin.core.getState()[this.plugin.stateId]
+          const { files, folders } = this.plugin.getPluginState()
           this._updateFilesAndFolders(res, files, folders)
         }).catch(this.handleError)
         .then(() => { this._isHandlingScroll = false }) // always called
@@ -545,12 +535,12 @@ module.exports = class View {
   _loaderWrapper (promise, then, catch_) {
     promise
       .then(then).catch(catch_)
-      .then(() => this.updateState({ loading: false })) // always called.
-    this.updateState({ loading: true })
+      .then(() => this.plugin.setPluginState({ loading: false })) // always called.
+    this.plugin.setPluginState({ loading: true })
   }
 
   render (state) {
-    const { authenticated, checkAuthInProgress, loading } = state[this.plugin.stateId]
+    const { authenticated, checkAuthInProgress, loading } = this.plugin.getPluginState()
 
     if (loading) {
       return LoaderView()
@@ -567,7 +557,7 @@ module.exports = class View {
       })
     }
 
-    const browserProps = Object.assign({}, state[this.plugin.stateId], {
+    const browserProps = Object.assign({}, this.plugin.getPluginState(), {
       getNextFolder: this.getNextFolder,
       getFolder: this.getFolder,
       addFile: this.addFile,
diff --git a/src/plugins/DragDrop/index.js b/src/plugins/DragDrop/index.js
index 3876d1181..937759494 100644
--- a/src/plugins/DragDrop/index.js
+++ b/src/plugins/DragDrop/index.js
@@ -26,10 +26,6 @@ module.exports = class DragDrop extends Plugin {
       strings: {
         dropHereOr: 'Drop files here or',
         browse: 'browse'
-        // selectedFiles: {
-        //   0: '%{smart_count} file selected',
-        //   1: '%{smart_count} files selected'
-        // }
       }
     }
 
diff --git a/src/plugins/Dropbox/index.js b/src/plugins/Dropbox/index.js
index a915ddd89..e46a40e3a 100644
--- a/src/plugins/Dropbox/index.js
+++ b/src/plugins/Dropbox/index.js
@@ -12,7 +12,6 @@ module.exports = class Dropbox extends Plugin {
     this.type = 'acquirer'
     this.id = this.opts.id || 'Dropbox'
     this.title = 'Dropbox'
-    this.stateId = 'dropbox'
     this.icon = () => html`
       <svg class="UppyIcon" width="128" height="118" viewBox="0 0 128 118">
         <path d="M38.145.777L1.108 24.96l25.608 20.507 37.344-23.06z"/>
@@ -23,7 +22,7 @@ module.exports = class Dropbox extends Plugin {
 
     // writing out the key explicitly for readability the key used to store
     // the provider instance must be equal to this.id.
-    this.Dropbox = new Provider(core, {
+    this[this.id] = new Provider(core, {
       host: this.opts.host,
       provider: 'dropbox'
     })
@@ -31,7 +30,7 @@ module.exports = class Dropbox extends Plugin {
     this.files = []
 
     this.onAuth = this.onAuth.bind(this)
-    // Visual
+
     this.render = this.render.bind(this)
 
     // set default options
@@ -44,18 +43,14 @@ module.exports = class Dropbox extends Plugin {
   install () {
     this.view = new View(this)
     // Set default state
-    this.core.setState({
-      // writing out the key explicitly for readability the key used to store
-      // the plugin state must be equal to this.stateId.
-      dropbox: {
-        authenticated: false,
-        files: [],
-        folders: [],
-        directories: [],
-        activeRow: -1,
-        filterInput: '',
-        isSearchVisible: false
-      }
+    this.setPluginState({
+      authenticated: false,
+      files: [],
+      folders: [],
+      directories: [],
+      activeRow: -1,
+      filterInput: '',
+      isSearchVisible: false
     })
 
     const target = this.opts.target
@@ -70,7 +65,7 @@ module.exports = class Dropbox extends Plugin {
   }
 
   onAuth (authenticated) {
-    this.view.updateState({authenticated})
+    this.setPluginState({ authenticated })
     if (authenticated) {
       this.view.getFolder()
     }
diff --git a/src/plugins/GoogleDrive/index.js b/src/plugins/GoogleDrive/index.js
index e85f3440f..025071473 100644
--- a/src/plugins/GoogleDrive/index.js
+++ b/src/plugins/GoogleDrive/index.js
@@ -11,7 +11,6 @@ module.exports = class GoogleDrive extends Plugin {
     this.type = 'acquirer'
     this.id = this.opts.id || 'GoogleDrive'
     this.title = 'Google Drive'
-    this.stateId = 'googleDrive'
     this.icon = () => html`
       <svg aria-hidden="true" class="UppyIcon UppyModalTab-icon" width="28" height="28" viewBox="0 0 16 16">
         <path d="M2.955 14.93l2.667-4.62H16l-2.667 4.62H2.955zm2.378-4.62l-2.666 4.62L0 10.31l5.19-8.99 2.666 4.62-2.523 4.37zm10.523-.25h-5.333l-5.19-8.99h5.334l5.19 8.99z"/>
@@ -20,7 +19,7 @@ module.exports = class GoogleDrive extends Plugin {
 
     // writing out the key explicitly for readability the key used to store
     // the provider instance must be equal to this.id.
-    this.GoogleDrive = new Provider(core, {
+    this[this.id] = new Provider(core, {
       host: this.opts.host,
       provider: 'drive',
       authProvider: 'google'
@@ -42,18 +41,14 @@ module.exports = class GoogleDrive extends Plugin {
   install () {
     this.view = new View(this)
     // Set default state for Google Drive
-    this.core.setState({
-      // writing out the key explicitly for readability the key used to store
-      // the plugin state must be equal to this.stateId.
-      googleDrive: {
-        authenticated: false,
-        files: [],
-        folders: [],
-        directories: [],
-        activeRow: -1,
-        filterInput: '',
-        isSearchVisible: false
-      }
+    this.setPluginState({
+      authenticated: false,
+      files: [],
+      folders: [],
+      directories: [],
+      activeRow: -1,
+      filterInput: '',
+      isSearchVisible: false
     })
 
     const target = this.opts.target
@@ -68,7 +63,7 @@ module.exports = class GoogleDrive extends Plugin {
   }
 
   onAuth (authenticated) {
-    this.view.updateState({authenticated})
+    this.setPluginState({ authenticated })
     if (authenticated) {
       this.view.getFolder('root')
     }
diff --git a/src/plugins/Instagram/index.js b/src/plugins/Instagram/index.js
index 7969c098a..0f91c5057 100644
--- a/src/plugins/Instagram/index.js
+++ b/src/plugins/Instagram/index.js
@@ -11,20 +11,17 @@ module.exports = class Instagram extends Plugin {
     this.type = 'acquirer'
     this.id = this.opts.id || 'Instagram'
     this.title = 'Instagram'
-    this.stateId = 'instagram'
     this.icon = () => html`
       <svg aria-hidden="true" class="UppyIcon UppyModalTab-icon" width="28" height="28" viewBox="0 0 512 512">
-        <path
-          d="M256,49.471c67.266,0,75.233.257,101.8,1.469,24.562,1.121,37.9,5.224,46.778,8.674a78.052,78.052,0,0,1,28.966,18.845,78.052,78.052,0,0,1,18.845,28.966c3.45,8.877,7.554,22.216,8.674,46.778,1.212,26.565,1.469,34.532,1.469,101.8s-0.257,75.233-1.469,101.8c-1.121,24.562-5.225,37.9-8.674,46.778a83.427,83.427,0,0,1-47.811,47.811c-8.877,3.45-22.216,7.554-46.778,8.674-26.56,1.212-34.527,1.469-101.8,1.469s-75.237-.257-101.8-1.469c-24.562-1.121-37.9-5.225-46.778-8.674a78.051,78.051,0,0,1-28.966-18.845,78.053,78.053,0,0,1-18.845-28.966c-3.45-8.877-7.554-22.216-8.674-46.778-1.212-26.564-1.469-34.532-1.469-101.8s0.257-75.233,1.469-101.8c1.121-24.562,5.224-37.9,8.674-46.778A78.052,78.052,0,0,1,78.458,78.458a78.053,78.053,0,0,1,28.966-18.845c8.877-3.45,22.216-7.554,46.778-8.674,26.565-1.212,34.532-1.469,101.8-1.469m0-45.391c-68.418,0-77,.29-103.866,1.516-26.815,1.224-45.127,5.482-61.151,11.71a123.488,123.488,0,0,0-44.62,29.057A123.488,123.488,0,0,0,17.3,90.982C11.077,107.007,6.819,125.319,5.6,152.134,4.369,179,4.079,187.582,4.079,256S4.369,333,5.6,359.866c1.224,26.815,5.482,45.127,11.71,61.151a123.489,123.489,0,0,0,29.057,44.62,123.486,123.486,0,0,0,44.62,29.057c16.025,6.228,34.337,10.486,61.151,11.71,26.87,1.226,35.449,1.516,103.866,1.516s77-.29,103.866-1.516c26.815-1.224,45.127-5.482,61.151-11.71a128.817,128.817,0,0,0,73.677-73.677c6.228-16.025,10.486-34.337,11.71-61.151,1.226-26.87,1.516-35.449,1.516-103.866s-0.29-77-1.516-103.866c-1.224-26.815-5.482-45.127-11.71-61.151a123.486,123.486,0,0,0-29.057-44.62A123.487,123.487,0,0,0,421.018,17.3C404.993,11.077,386.681,6.819,359.866,5.6,333,4.369,324.418,4.079,256,4.079h0Z"/>
-        <path
-          d="M256,126.635A129.365,129.365,0,1,0,385.365,256,129.365,129.365,0,0,0,256,126.635Zm0,213.338A83.973,83.973,0,1,1,339.974,256,83.974,83.974,0,0,1,256,339.973Z"/>
+        <path d="M256,49.471c67.266,0,75.233.257,101.8,1.469,24.562,1.121,37.9,5.224,46.778,8.674a78.052,78.052,0,0,1,28.966,18.845,78.052,78.052,0,0,1,18.845,28.966c3.45,8.877,7.554,22.216,8.674,46.778,1.212,26.565,1.469,34.532,1.469,101.8s-0.257,75.233-1.469,101.8c-1.121,24.562-5.225,37.9-8.674,46.778a83.427,83.427,0,0,1-47.811,47.811c-8.877,3.45-22.216,7.554-46.778,8.674-26.56,1.212-34.527,1.469-101.8,1.469s-75.237-.257-101.8-1.469c-24.562-1.121-37.9-5.225-46.778-8.674a78.051,78.051,0,0,1-28.966-18.845,78.053,78.053,0,0,1-18.845-28.966c-3.45-8.877-7.554-22.216-8.674-46.778-1.212-26.564-1.469-34.532-1.469-101.8s0.257-75.233,1.469-101.8c1.121-24.562,5.224-37.9,8.674-46.778A78.052,78.052,0,0,1,78.458,78.458a78.053,78.053,0,0,1,28.966-18.845c8.877-3.45,22.216-7.554,46.778-8.674,26.565-1.212,34.532-1.469,101.8-1.469m0-45.391c-68.418,0-77,.29-103.866,1.516-26.815,1.224-45.127,5.482-61.151,11.71a123.488,123.488,0,0,0-44.62,29.057A123.488,123.488,0,0,0,17.3,90.982C11.077,107.007,6.819,125.319,5.6,152.134,4.369,179,4.079,187.582,4.079,256S4.369,333,5.6,359.866c1.224,26.815,5.482,45.127,11.71,61.151a123.489,123.489,0,0,0,29.057,44.62,123.486,123.486,0,0,0,44.62,29.057c16.025,6.228,34.337,10.486,61.151,11.71,26.87,1.226,35.449,1.516,103.866,1.516s77-.29,103.866-1.516c26.815-1.224,45.127-5.482,61.151-11.71a128.817,128.817,0,0,0,73.677-73.677c6.228-16.025,10.486-34.337,11.71-61.151,1.226-26.87,1.516-35.449,1.516-103.866s-0.29-77-1.516-103.866c-1.224-26.815-5.482-45.127-11.71-61.151a123.486,123.486,0,0,0-29.057-44.62A123.487,123.487,0,0,0,421.018,17.3C404.993,11.077,386.681,6.819,359.866,5.6,333,4.369,324.418,4.079,256,4.079h0Z"/>
+        <path d="M256,126.635A129.365,129.365,0,1,0,385.365,256,129.365,129.365,0,0,0,256,126.635Zm0,213.338A83.973,83.973,0,1,1,339.974,256,83.974,83.974,0,0,1,256,339.973Z"/>
         <circle cx="390.476" cy="121.524" r="30.23"/>
       </svg>
     `
 
     // writing out the key explicitly for readability the key used to store
     // the provider instance must be equal to this.id.
-    this.Instagram = new Provider(core, {
+    this[this.id] = new Provider(core, {
       host: this.opts.host,
       provider: 'instagram',
       authProvider: 'instagram'
@@ -48,18 +45,14 @@ module.exports = class Instagram extends Plugin {
       viewType: 'grid'
     })
     // Set default state for Google Drive
-    this.core.setState({
-      // writing out the key explicitly for readability the key used to store
-      // the plugin state must be equal to this.stateId.
-      instagram: {
-        authenticated: false,
-        files: [],
-        folders: [],
-        directories: [],
-        activeRow: -1,
-        filterInput: '',
-        isSearchVisible: false
-      }
+    this.setPluginState({
+      authenticated: false,
+      files: [],
+      folders: [],
+      directories: [],
+      activeRow: -1,
+      filterInput: '',
+      isSearchVisible: false
     })
 
     const target = this.opts.target
@@ -74,7 +67,7 @@ module.exports = class Instagram extends Plugin {
   }
 
   onAuth (authenticated) {
-    this.view.updateState({authenticated})
+    this.setPluginState({ authenticated })
     if (authenticated) {
       this.view.getFolder('recent')
     }

From 731a7d9e4d3dea876838e6eeb5aeb845dae3ecdc Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Mon, 27 Nov 2017 16:34:54 -0500
Subject: [PATCH 46/54] add temp timeout to setFocusToFirstNode and
 updateDashboardElWidth

---
 src/plugins/Dashboard/index.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/plugins/Dashboard/index.js b/src/plugins/Dashboard/index.js
index dc0c3fe9a..2b9a92196 100644
--- a/src/plugins/Dashboard/index.js
+++ b/src/plugins/Dashboard/index.js
@@ -210,9 +210,8 @@ module.exports = class DashboardUI extends Plugin {
     document.body.classList.add('is-UppyDashboard-open')
     document.body.style.top = `-${this.savedDocumentScrollPosition}px`
 
-    this.setFocusToFirstNode()
-
-    this.updateDashboardElWidth()
+    setTimeout(this.setFocusToFirstNode, 100)
+    setTimeout(this.updateDashboardElWidth, 100)
     // to be sure, sometimes when the function runs, container size is still 0
     // setTimeout(this.updateDashboardElWidth, 500)
   }

From 629cfb11ac3e6bd62f8eb176504c9296d8140187 Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Mon, 27 Nov 2017 16:35:01 -0500
Subject: [PATCH 47/54] changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfc3c02ff..b981a86cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -96,6 +96,7 @@ Theme: 🎄 Christmas edition
 - [ ] core: css-in-js, while keeping non-random classnames (ideally prefixed) and useful preprocessor features. also see simple https://github.com/codemirror/CodeMirror/blob/master/lib/codemirror.css (@arturi, @goto-bus-stop)
 - [ ] core: improve on Redux PR #216 to allow using Redux (or any other solution) for all Uppy state management, instead of proxy-only (@goto-bus-stop, @arturi)
 - [x] core: limit amount of simultaneous uploads, queuing? #360 (#427 / @goto-bus-stop)
+- [x] core: queue preview generation #431
 - [ ] core: research !important styles to be immune to any environment/page. Maybe use smth like `postcss-safe-important`, http://cleanslatecss.com/ Or increase specificity (with .uppy prefix) (@arturi)
 - [ ] dashboard: allow minimizing the Dashboard during upload (Uppy then becomes just a tiny progress indicator) (@arturi)
 - [ ] dashboard: cancel button for any kind of uploads? currently resume/pause only for tus, and cancel for XHR (@arturi, @goto-bus-stop)

From 9900212807af2847ee58b3b1737224a68ecd359d Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Tue, 28 Nov 2017 18:13:15 -0500
Subject: [PATCH 48/54] add image cropping todo to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b981a86cd..1f32a5fb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,7 @@ Ideas that will be planned and find their way into a release at one point
 - [ ] have a `resetProgress` method for resetting a single file, and call it before starting an upload. see comment in #393
 - [ ] “Custom Provider” plugin for  Dashboard — shows already uploaded files or files from a custom service; accepts an array of files to show in options, no uppy-server required #362
 - [ ] WordPress plugin
+- [ ] Transformations, cropping, filters for images, see #53
 
 ## 1.0 Goals
 

From fc219598b51b637b704f9a570208fc48eb20c1a0 Mon Sep 17 00:00:00 2001
From: Richard Willars <richard@richardwillars.com>
Date: Wed, 29 Nov 2017 13:43:06 +0000
Subject: [PATCH 49/54] Moves thumbnail disabling logic into core.js

---
 src/core/Core.js       | 10 ++++++++--
 src/core/Core.test.js  | 22 ++++++++++++++--------
 src/core/Utils.js      |  6 +-----
 src/core/Utils.test.js | 12 ------------
 4 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/core/Core.js b/src/core/Core.js
index 265f1df93..739e9dedc 100644
--- a/src/core/Core.js
+++ b/src/core/Core.js
@@ -395,8 +395,14 @@ class Uppy {
    */
   generatePreview (file) {
     if (Utils.isPreviewSupported(file.type) && !file.isRemote) {
-      Utils.createThumbnail(file, 200, this.opts.thumbnailGeneration).then((thumbnail) => {
-        this.setPreviewURL(file.id, thumbnail)
+      let previewPromise
+      if (this.opts.thumbnailGeneration === true) {
+        previewPromise = Utils.createThumbnail(file, 200)
+      } else {
+        previewPromise = Promise.resolve(URL.createObjectURL(file.data))
+      }
+      previewPromise.then((preview) => {
+        this.setPreviewURL(file.id, preview)
       }).catch((err) => {
         console.warn(err.stack || err.message)
       })
diff --git a/src/core/Core.test.js b/src/core/Core.test.js
index 047c680e2..aafbddc08 100644
--- a/src/core/Core.test.js
+++ b/src/core/Core.test.js
@@ -11,6 +11,7 @@ const sampleImageDataURI =
   'data:image/jpeg;base64,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'
 
 describe('src/Core', () => {
+  const RealCreateObjectUrl = global.URL.createObjectURL
   beforeEach(() => {
     jest.spyOn(utils, 'findDOMElement').mockImplementation(path => {
       return 'some config...'
@@ -19,6 +20,12 @@ describe('src/Core', () => {
       return Promise.resolve(sampleImageDataURI)
     })
     utils.createThumbnail.mockClear()
+
+    global.URL.createObjectURL = jest.fn().mockReturnValue('newUrl')
+  })
+
+  afterEach(() => {
+    global.URL.createObjectURL = RealCreateObjectUrl
   })
 
   it('should expose a class', () => {
@@ -591,7 +598,7 @@ describe('src/Core', () => {
       })).rejects.toMatchObject({ message: 'onBeforeFileAdded: a plain string' })
     })
 
-    it('should call utils.generatePreview when core:file-added is triggered', () => {
+    it('should call utils.generatePreview when core:file-added is triggered and thumbnail generation is allowed', () => {
       const core = new Core({
       }).run()
       const file = {
@@ -599,23 +606,22 @@ describe('src/Core', () => {
         isRemote: false
       }
       core.emit('core:file-added', file)
-      expect(utils.createThumbnail).toHaveBeenCalledOnce
+      expect(utils.createThumbnail).toHaveBeenCalledTimes(1)
       expect(utils.createThumbnail.mock.calls[0][1]).toEqual(200)
-      expect(utils.createThumbnail.mock.calls[0][2]).toEqual(true)
     })
 
-    it('should call utils.generatePreview when core:file-added is triggered, but the thumbnail generation should be bypassed when specified by the config', () => {
+    it('should return an object url of the image when core:file-added is triggered and thumbnail generation is disabled', () => {
       const core = new Core({
         thumbnailGeneration: false
       }).run()
       const file = {
         type: 'image/jpeg',
-        isRemote: false
+        isRemote: false,
+        data: 'foo'
       }
       core.emit('core:file-added', file)
-      expect(utils.createThumbnail).toHaveBeenCalledOnce
-      expect(utils.createThumbnail.mock.calls[0][1]).toEqual(200)
-      expect(utils.createThumbnail.mock.calls[0][2]).toEqual(false)
+      expect(URL.createObjectURL).toHaveBeenCalledTimes(1)
+      expect(URL.createObjectURL).toHaveBeenCalledWith('foo')
     })
   })
 
diff --git a/src/core/Utils.js b/src/core/Utils.js
index 48fb20584..26903fd9f 100644
--- a/src/core/Utils.js
+++ b/src/core/Utils.js
@@ -215,12 +215,8 @@ function getProportionalHeight (img, width) {
  * @param {number} width
  * @return {Promise}
  */
-function createThumbnail (file, targetWidth, shouldGenerateThumbnail) {
+function createThumbnail (file, targetWidth) {
   const originalUrl = URL.createObjectURL(file.data)
-  if (shouldGenerateThumbnail === false) {
-    return Promise.resolve(originalUrl)
-  }
-
   const onload = new Promise((resolve, reject) => {
     const image = new Image()
     image.src = originalUrl
diff --git a/src/core/Utils.test.js b/src/core/Utils.test.js
index 49e0d759d..483a2dd6e 100644
--- a/src/core/Utils.test.js
+++ b/src/core/Utils.test.js
@@ -275,18 +275,6 @@ describe('core/utils', () => {
       'should create a thumbnail of the specified image at the specified width',
       () => {}
     )
-    it(
-      'should bypass the creation of a thumbnail when the generateThumbnail param is false',
-      () => {
-        const file = {
-          data: 'foobar'
-        }
-        const targetWidth = 200
-        return utils.createThumbnail(file, targetWidth, false).then((url) => {
-          expect(url).toEqual('newUrl')
-        })
-      }
-    )
   })
 
   describe('dataURItoBlob', () => {

From f567c6cf26f57993ff552119dc8e2db2fcee14ac Mon Sep 17 00:00:00 2001
From: Ifedapo Olarewaju <ifedapoolarewaju@gmail.com>
Date: Thu, 30 Nov 2017 06:04:00 +0100
Subject: [PATCH 50/54] fix: folder deselection did not remove all files

---
 src/generic-provider-views/index.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/generic-provider-views/index.js b/src/generic-provider-views/index.js
index 82ca366b2..023567e39 100644
--- a/src/generic-provider-views/index.js
+++ b/src/generic-provider-views/index.js
@@ -378,7 +378,12 @@ module.exports = class View {
     if (folder.loading) {
       return
     }
-    for (let fileId of folder.files) {
+    // deepcopy the files before iteration because the
+    // original array constantly gets mutated during
+    // the iteration by updateFolderState as each file
+    // is removed and 'core:file-removed' is emitted.
+    const files = folder.files.concat([])
+    for (const fileId of files) {
       if (fileId in this.plugin.core.getState().files) {
         this.plugin.core.removeFile(fileId)
       }

From 00222343861757c767f25489ea2856d189f18239 Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Thu, 30 Nov 2017 18:00:52 -0500
Subject: [PATCH 51/54] changelog

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f32a5fb3..bcda299c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,9 @@ Ideas that will be planned and find their way into a release at one point
 - [ ] “Custom Provider” plugin for  Dashboard — shows already uploaded files or files from a custom service; accepts an array of files to show in options, no uppy-server required #362
 - [ ] WordPress plugin
 - [ ] Transformations, cropping, filters for images, see #53
+- [ ] Prepare for (piwik-) tracking of usage of uppy ? see #83
+- [ ] screenshot+screencast support similar to Webcam #148
+- [ ] Webcam modes #198
 
 ## 1.0 Goals
 
@@ -85,6 +88,10 @@ What we need to do to release Uppy 1.0
 - [ ] consider iframe / more security for Transloadit/Uppy integration widget and Uppy itself. Page can’t get files from Google Drive if its an iframe; possibility for folder restriction for provider plugins
 - [ ] automatically host releases on edgly and use that as our main CDN
 
+## 0.23
+
+- [ ] Audio: audio recording similar to Webcam #143
+
 # next
 
 ## 0.22.0

From 1da9e505bee156e5fcc95ffda66cf62d766015a9 Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Thu, 30 Nov 2017 18:06:29 -0500
Subject: [PATCH 52/54] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a03d42cab..7fe6eafe4 100644
--- a/README.md
+++ b/README.md
@@ -125,7 +125,7 @@ Note: we aim to support IE10+ and recent versions of Safari, Edge, Chrome, Firef
 
 ### React support?
 
-Yep. Uppy-React component is in the works, in the meantime you can just use it as any other lib with React, [see here](https://github.com/transloadit/uppy/tree/uppy-react/src/uppy-react).
+Yep, see [Uppy React docs](https://uppy.io/docs/react/).
 
 ### Can I use it with Rails/Node/Go/PHP?
 

From 385fe04ce08c9df87c28cab3322eee8b4e69dc75 Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Fri, 1 Dec 2017 23:26:57 -0500
Subject: [PATCH 53/54] remove MetaData from `index.js`

---
 src/index.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/index.js b/src/index.js
index 73d4a51d7..8fdbdefb8 100644
--- a/src/index.js
+++ b/src/index.js
@@ -21,7 +21,6 @@ const ProgressBar = require('./plugins/ProgressBar.js')
 const Informer = require('./plugins/Informer.js')
 
 // Modifiers
-const MetaData = require('./plugins/MetaData.js')
 
 // Uploaders
 const Tus = require('./plugins/Tus')
@@ -51,7 +50,6 @@ module.exports = {
   Transloadit,
   AwsS3,
   Dashboard,
-  MetaData,
   Webcam,
   GoldenRetriever,
   ReduxDevTools,

From 856dde92340d4baeb873db02563c16960194cf4b Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Fri, 1 Dec 2017 23:46:49 -0500
Subject: [PATCH 54/54] Revert "remove MetaData from `index.js`"

This reverts commit 385fe04ce08c9df87c28cab3322eee8b4e69dc75.
---
 src/index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/index.js b/src/index.js
index 8fdbdefb8..73d4a51d7 100644
--- a/src/index.js
+++ b/src/index.js
@@ -21,6 +21,7 @@ const ProgressBar = require('./plugins/ProgressBar.js')
 const Informer = require('./plugins/Informer.js')
 
 // Modifiers
+const MetaData = require('./plugins/MetaData.js')
 
 // Uploaders
 const Tus = require('./plugins/Tus')
@@ -50,6 +51,7 @@ module.exports = {
   Transloadit,
   AwsS3,
   Dashboard,
+  MetaData,
   Webcam,
   GoldenRetriever,
   ReduxDevTools,