Fixing 0 bytes

avoidwork · Jan 25, 2017 · d957df3 · d957df3
1 parent 7bc227e
commit d957df3
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 10 deletions.
diff --git a/lib/filesize.es6.js b/lib/filesize.es6.js
@@ -3,7 +3,7 @@
  *
  * @copyright 2017 Jason Mulligan <jason.mulligan@avoidwork.com>
  * @license BSD-3-Clause
- * @version 3.5.1
+ * @version 3.5.3
  */
 (function (global) {
 	const b = /^(b|B)$/,
@@ -60,6 +60,7 @@
 
 		// Zero is now a special case because bytes divide by 1
 		if (num === 0) {
+			e = 0;
 			result[0] = 0;
 			result[1] = unix ? "" : !bits ? "B" : "b";
 		} else {
@@ -123,7 +124,7 @@
 		}
 
 		if (full) {
-			result[1] = fullform[standard][e] + (bits ? "bit" : "byte") + (result[0] > 1 ? "s" : "");
+			result[1] = fullform[standard][e] + (bits ? "bit" : "byte") + (result[0] === 1 ? "" : "s");
 		}
 
 		return result.join(spacer);

diff --git a/lib/filesize.js b/lib/filesize.js
@@ -5,7 +5,7 @@
  *
  * @copyright 2017 Jason Mulligan <jason.mulligan@avoidwork.com>
  * @license BSD-3-Clause
- * @version 3.5.1
+ * @version 3.5.3
  */
 (function (global) {
 	var b = /^(b|B)$/,
@@ -76,6 +76,7 @@
 
 		// Zero is now a special case because bytes divide by 1
 		if (num === 0) {
+			e = 0;
 			result[0] = 0;
 			result[1] = unix ? "" : !bits ? "B" : "b";
 		} else {
@@ -139,7 +140,7 @@
 		}
 
 		if (full) {
-			result[1] = fullform[standard][e] + (bits ? "bit" : "byte") + (result[0] > 1 ? "s" : "");
+			result[1] = fullform[standard][e] + (bits ? "bit" : "byte") + (result[0] === 1 ? "" : "s");
 		}
 
 		return result.join(spacer);

diff --git a/lib/filesize.min.js b/lib/filesize.min.js
diff --git a/lib/filesize.min.js.map b/lib/filesize.min.js.map
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "filesize",
   "description": "JavaScript library to generate a human readable String describing the file size",
-  "version": "3.5.2",
+  "version": "3.5.3",
   "homepage": "http://filesizejs.com",
   "author": "Jason Mulligan <jason.mulligan@avoidwork.com>",
   "repository": {