Merge remote-tracking branch 'origin/master'

apps/files/static/files/upload.js

@@ -38,14 +38,23 @@ class MultipleFilesWidget {
             }
         })
 
+        // If there is something in the field, we need to restore our state
+        if (this.element.field.value) {
+            this.rebuildListFromField()
+        }
+
         // Set up listening for restore
         this.element.field.addEventListener('change', evt => {
-            let idList = evt.srcElement.value.split(",")
+            this.rebuildListFromField()
+        })
+    }
+
+    rebuildListFromField() {
+        let idList = this.element.field.value.split(",")
         for (let id of idList) {
-                this.addFile(id, id, this.setFileDone.bind(this))
+            this.addFile(id, `Saved upload (id ${id})`, this.setFileDone.bind(this))
         }
         this.viewFileList()
-        })
     }
 
     addFile(id, name, stateFunc) {