Fix directly uploading zero-byte files

Closes #33450.
rails · Jul 27, 2018 · 1954637 · 1954637
1 parent 36f28fd
commit 1954637
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/activestorage/app/assets/javascripts/activestorage.js b/activestorage/app/assets/javascripts/activestorage.js
@@ -484,7 +484,7 @@
     }, {
       key: "readNextChunk",
       value: function readNextChunk() {
-        if (this.chunkIndex < this.chunkCount) {
+        if (this.chunkIndex < this.chunkCount || this.chunkIndex == 0 && this.chunkCount == 0) {
           var start = this.chunkIndex * this.chunkSize;
           var end = Math.min(start + this.chunkSize, this.file.size);
           var bytes = fileSlice.call(this.file, start, end);

diff --git a/activestorage/app/javascript/activestorage/file_checksum.js b/activestorage/app/javascript/activestorage/file_checksum.js
@@ -39,7 +39,7 @@ export class FileChecksum {
   }
 
   readNextChunk() {
-    if (this.chunkIndex < this.chunkCount) {
+    if (this.chunkIndex < this.chunkCount || this.chunkIndex == 0 && this.chunkCount == 0) {
       const start = this.chunkIndex * this.chunkSize
       const end = Math.min(start + this.chunkSize, this.file.size)
       const bytes = fileSlice.call(this.file, start, end)