Minor changes to 'fox-custom' files

Author: tjohnston-softdev

changelog.md

@@ -1,19 +1,24 @@
 # Changelog
 
-**./fox-api/alarm-database.js - checkTimeMatch**
-* Simplified function code. Check is performed on single line.
+**./fox-custom/folder-item.js - checkNameType**
+* 'checkRes' is assigned using an evaluation instead of an IF structure.
 
 ---
 
-**./fox-api/database-array.js**
-* Reduced whitespace between 'setAlarmDatabase' and `module.exports`
+**./fox-custom/fs-drive.js - writeUnixName**
+* Simplified function code. String is written on one line.
 
 ---
 
-**./fox-api/download-prep.js - writeMissingFileError**
-* Simplified function code. Error message is written using single line.
+**./fox-custom/rio-program.js**
+* 'checkRes' is now assigned using an evaluation instead of an IF structure. (checkRioDeviceRunning)
+* Re-wrote 'text' result property assignment for readability (saveFilteredDevice)
 
 ---
 
-**./fox-api/folder-info.js**
-* Reduced whitespace between 'loopFolderContents' and `module.exports`
+**./fox-custom/validation-tasks.js**
+* Simplified result checking in 'checkBaseObjectType'
+* Compressed string-writing code in functions:
+	* writePropertyTypeError
+	* writeUnsupportedValueError
+* Re-wrote 'quoteText' for readability.

fox-custom/folder-item.js

@@ -75,13 +75,7 @@ function defineItemObject(itemName, itemSize, itemDir, itemModifiedTs, itemCreat
 function checkNameType(nValue)
 {
 	var givenType = typeof nValue;
-	var checkRes = false;
-	
-	if (givenType === "string" && nValue.length > 0)
-	{
-		checkRes = true;
-	}
-	
+	var checkRes = (givenType === "string" && nValue.length > 0);
 	return checkRes;
 }
 

fox-custom/fs-drive.js

@@ -51,13 +51,7 @@ function handleWindows(letterNum, winObj)
 // Writes name for UNIX volumes.
 function writeUnixName(driveNum)
 {
-	var writeRes = "";
-	
-	writeRes += "/"
-	writeRes += platform;
-	writeRes += "/drive";
-	writeRes += driveNum;
-	
+	var writeRes = ["/", platform, "/drive", driveNum].join("");
 	return writeRes;
 }
 

fox-custom/rio-program.js

@@ -6,12 +6,7 @@ function checkRioDeviceRunning(inpDeviceID, runDeviceList)
 {
 	var deviceObject = runDeviceList[inpDeviceID];
 	var elementType = typeof deviceObject;
-	var checkRes = false;
-	
-	if (deviceObject !== undefined && deviceObject !== null && elementType === "object")
-	{
-		checkRes = true;
-	}
+	var checkRes = (deviceObject !== undefined && deviceObject !== null && elementType === "object");
 
 	return checkRes;
 }
@@ -87,7 +82,7 @@ function saveFilteredDevice(deviceObj)
 	var saveRes = {};
 
 	saveRes["value"] = deviceObj.id;
-	saveRes["text"] = deviceObj.name + " - " + deviceObj.ipAddress;
+	saveRes["text"] = [deviceObj.name, " - ", deviceObj.ipAddress].join("");
 	saveRes["name"] = deviceObj.name;
 
 	return saveRes;

fox-custom/validation-tasks.js

@@ -7,14 +7,10 @@ const ipOpts = {exact: true, includeBoundaries: true};
 function checkBaseObjectType(inputObj, inputDesc)
 {
 	var givenType = typeof inputObj;
-	var correctType = false;
+	var correctType = (inputObj !== undefined && inputObj !== null && givenType === "object");
 	var flaggedMessage = "";
 
-	if (inputObj !== undefined && inputObj !== null && givenType === "object")
-	{
-		correctType = true;
-	}
-	else
+	if (correctType !== true)
 	{
 		flaggedMessage = inputDesc + " must be an object";
 		throw new Error(flaggedMessage);
@@ -188,16 +184,9 @@ function writePropertyTypeError(vProp, vType, vEntry, vClass, vAction)
 {
 	var writeRes = "";
 
-	writeRes += "Invalid type! ";
-	writeRes += vProp;
-	writeRes += " must be ";
+	writeRes += ["Invalid type! ", vProp, " must be "].join("");
 	writeRes += quoteText(vType);
-	writeRes += " when got value ";
-	writeRes += vEntry;
-	writeRes += " in ";
-	writeRes += vClass;
-	writeRes += " during ";
-	writeRes += vAction;
+	writeRes += [" when got value ", vEntry, " in ", vClass, " during ", vAction].join("");
 
 	return writeRes;
 }
@@ -206,13 +195,7 @@ function writePropertyTypeError(vProp, vType, vEntry, vClass, vAction)
 // Writes unsupported value error text.
 function writeUnsupportedValueError(vProp, vUnknown)
 {
-	var writeRes = "";
-	
-	writeRes += ".";
-	writeRes += vProp;
-	writeRes += " = ";
-	writeRes += vUnknown;
-	writeRes += " is not supported!";
+	var writeRes = [".", vProp, " = ", vUnknown, " is not supported!"].join("");
 	return writeRes;
 }
 
@@ -221,7 +204,7 @@ function writeUnsupportedValueError(vProp, vUnknown)
 // Adds quote to error.
 function quoteText(txt)
 {
-	var quoted = "'" + txt + "'";
+	var quoted = ["'", txt, "'"].join("");
 	return quoted;
 }