Fixing order of ops that could've impacted object output

Author: avoidwork

lib/filesize.es6.js

@@ -3,7 +3,7 @@
  *
  * @copyright 2019 Jason Mulligan <[email protected]>
  * @license BSD-3-Clause
- * @version 4.1.0
+ * @version 4.1.1
  */
 (function (global) {
 	const b = /^(b|B)$/,
@@ -121,10 +121,6 @@
 			return e;
 		}
 
-		if (output === "object") {
-			return {value: result[0], symbol: result[1]};
-		}
-
 		if (full) {
 			result[1] = fullforms[e] ? fullforms[e] : fullform[standard][e] + (bits ? "bit" : "byte") + (result[0] === 1 ? "" : "s");
 		}
@@ -135,6 +131,10 @@
 			result[0] = result[0].toString().replace(".", separator);
 		}
 
+		if (output === "object") {
+			return {value: result[0], symbol: result[1]};
+		}
+
 		return result.join(spacer);
 	}
 

lib/filesize.es6.min.js

@@ -5,7 +5,7 @@
  *
  * @copyright 2019 Jason Mulligan <[email protected]>
  * @license BSD-3-Clause
- * @version 4.1.0
+ * @version 4.1.1
  */
 (function (global) {
 	var b = /^(b|B)$/,
@@ -140,10 +140,6 @@
 			return e;
 		}
 
-		if (output === "object") {
-			return { value: result[0], symbol: result[1] };
-		}
-
 		if (full) {
 			result[1] = fullforms[e] ? fullforms[e] : fullform[standard][e] + (bits ? "bit" : "byte") + (result[0] === 1 ? "" : "s");
 		}
@@ -154,6 +150,10 @@
 			result[0] = result[0].toString().replace(".", separator);
 		}
 
+		if (output === "object") {
+			return { value: result[0], symbol: result[1] };
+		}
+
 		return result.join(spacer);
 	}
 

lib/filesize.es6.min.js.map

@@ -1,7 +1,7 @@
 {
   "name": "filesize",
   "description": "JavaScript library to generate a human readable String describing the file size",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "homepage": "https://filesizejs.com",
   "author": "Jason Mulligan <[email protected]>",
   "repository": {

lib/filesize.js

@@ -97,10 +97,6 @@
 			return e;
 		}
 
-		if (output === "object") {
-			return {value: result[0], symbol: result[1]};
-		}
-
 		if (full) {
 			result[1] = fullforms[e] ? fullforms[e] : fullform[standard][e] + (bits ? "bit" : "byte") + (result[0] === 1 ? "" : "s");
 		}
@@ -111,6 +107,10 @@
 			result[0] = result[0].toString().replace(".", separator);
 		}
 
+		if (output === "object") {
+			return {value: result[0], symbol: result[1]};
+		}
+
 		return result.join(spacer);
 	}