fix byte conversions

pqina · Oct 9, 2020 · b9da589 · b9da589
1 parent 95cc575
commit b9da589
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 4.21.1
+
+- Fix calculation of file size when `fileSizeBase` is set to 1024.
+
+
 ## 4.21.0
 
 - Add `fileSizeBase` use to adjust the way files sizes are displayed. Default is `1000`.

diff --git a/dist/filepond.css b/dist/filepond.css
@@ -1,5 +1,5 @@
 /*!
- * FilePond 4.21.0
+ * FilePond 4.21.1
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */

diff --git a/dist/filepond.esm.js b/dist/filepond.esm.js
@@ -1,5 +1,5 @@
 /*!
- * FilePond 4.21.0
+ * FilePond 4.21.1
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */
@@ -1349,7 +1349,7 @@ const toBytes = (value, base = 1000) => {
   // if is value in megabytes
   if (/MB$/i.test(naturalFileSize)) {
     naturalFileSize = naturalFileSize.replace(/MB$i/, '').trim();
-    return toInt(naturalFileSize) * base * 1000;
+    return toInt(naturalFileSize) * base * base;
   }
 
   // if is value in kilobytes
@@ -5285,8 +5285,8 @@ const toNaturalFileSize = (bytes, decimalSeparator = '.', base = 1000) => {
   bytes = Math.round(Math.abs(bytes));
 
   const KB = base;
-  const MB = base * 1000;
-  const GB = base * 1000000;
+  const MB = base * base;
+  const GB = base * base * base;
 
   // just bytes
   if (bytes < KB) {

diff --git a/dist/filepond.esm.min.js b/dist/filepond.esm.min.js
diff --git a/dist/filepond.js b/dist/filepond.js
@@ -1,5 +1,5 @@
 /*!
- * FilePond 4.21.0
+ * FilePond 4.21.1
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */
@@ -1595,7 +1595,7 @@
     // if is value in megabytes
     if (/MB$/i.test(naturalFileSize)) {
       naturalFileSize = naturalFileSize.replace(/MB$i/, '').trim();
-      return toInt(naturalFileSize) * base * 1000;
+      return toInt(naturalFileSize) * base * base;
     }
 
     // if is value in kilobytes
@@ -7836,8 +7836,8 @@
     bytes = Math.round(Math.abs(bytes));
 
     var KB = base;
-    var MB = base * 1000;
-    var GB = base * 1000000;
+    var MB = base * base;
+    var GB = base * base * base;
 
     // just bytes
     if (bytes < KB) {

diff --git a/dist/filepond.min.css b/dist/filepond.min.css
diff --git a/dist/filepond.min.js b/dist/filepond.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "filepond",
-    "version": "4.21.0",
+    "version": "4.21.1",
     "description": "FilePond, Where files go to stretch their bits.",
     "license": "MIT",
     "author": {

diff --git a/src/js/utils/toBytes.js b/src/js/utils/toBytes.js
@@ -14,7 +14,7 @@ export const toBytes = (value, base = 1000) => {
     // if is value in megabytes
     if (/MB$/i.test(naturalFileSize)) {
         naturalFileSize = naturalFileSize.replace(/MB$i/, '').trim();
-        return toInt(naturalFileSize) * base * 1000;
+        return toInt(naturalFileSize) * base * base;
     }
 
     // if is value in kilobytes

diff --git a/src/js/utils/toNaturalFileSize.js b/src/js/utils/toNaturalFileSize.js
@@ -3,8 +3,8 @@ export const toNaturalFileSize = (bytes, decimalSeparator = '.', base = 1000) =>
     bytes = Math.round(Math.abs(bytes));
 
     const KB = base;
-    const MB = base * 1000;
-    const GB = base * 1000000;
+    const MB = base * base;
+    const GB = base * base * base;
 
     // just bytes
     if (bytes < KB) {