From de46c283054792703a765676e39727ddcfaf15a2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Fri, 1 Sep 2017 17:42:47 -0600
Subject: [PATCH] Minor cleanup related stuff

---
 core/client_term.js               |  2 +-
 core/color_codes.js               | 14 ++++++++------
 core/multi_line_edit_text_view.js | 10 +---------
 mods/upload.js                    |  1 -
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/core/client_term.js b/core/client_term.js
index c9a9e66f..0f939307 100644
--- a/core/client_term.js
+++ b/core/client_term.js
@@ -169,7 +169,7 @@ ClientTerminal.prototype.pipeWrite = function(s, spec, cb) {
 	var conv = {
 		enigma		: enigmaToAnsi,
 		renegade	: renegadeToAnsi,
-	}[spec] || enigmaToAnsi;
+	}[spec] || renegadeToAnsi;
 	
 	this.write(conv(s, this), null, cb);	//	null = use default for |convertLineFeeds|
 };
diff --git a/core/color_codes.js b/core/color_codes.js
index 92a8650e..4dc8da99 100644
--- a/core/color_codes.js
+++ b/core/color_codes.js
@@ -23,6 +23,8 @@ exports.pipeToAnsi			= exports.renegadeToAnsi		= renegadeToAnsi;
 //	* fromWWIV(): <ctrl-c><0-7>
 //	* fromSyncronet(): <ctrl-a><colorCode>
 //	See http://wiki.synchro.net/custom:colors
+
+//	:TODO: rid of enigmaToAnsi() -- never really use. Instead, create bbsToAnsi() that supports renegade, PCB, WWIV, etc...
 function enigmaToAnsi(s, client) {
 	if(-1 == s.indexOf('|')) {
 		return s;	//	no pipe codes present
@@ -31,7 +33,7 @@ function enigmaToAnsi(s, client) {
 	var result	= '';
 	var re		= /\|([A-Z\d]{2}|\|)/g;
 	var m;
-    var lastIndex = 0;
+	var lastIndex = 0;
 	while((m = re.exec(s))) {
 		var val = m[1];
 
@@ -65,18 +67,18 @@ function enigmaToAnsi(s, client) {
 			}
 
 			result += s.substr(lastIndex, m.index - lastIndex) + attr;			
-	    }
+		}
 
-	    lastIndex = re.lastIndex;
+		lastIndex = re.lastIndex;
 	}
 
-    result = (0 === result.length ? s : result + s.substr(lastIndex));
+	result = (0 === result.length ? s : result + s.substr(lastIndex));
     
-    return result;
+	return result;
 }
 
 function stripEnigmaCodes(s) {
-    return s.replace(/\|[A-Z\d]{2}/g, '');
+	return s.replace(/\|[A-Z\d]{2}/g, '');
 }
 
 function enigmaStrLen(s) {
diff --git a/core/multi_line_edit_text_view.js b/core/multi_line_edit_text_view.js
index 19eadd95..b088a524 100644
--- a/core/multi_line_edit_text_view.js
+++ b/core/multi_line_edit_text_view.js
@@ -63,7 +63,7 @@ const _				= require('lodash');
 //	*
 
 
-var SPECIAL_KEY_MAP_DEFAULT = {
+const SPECIAL_KEY_MAP_DEFAULT = {
 	'line feed'		: [ 'return' ],
 	exit			: [ 'esc' ],
 	backspace		: [ 'backspace' ],
@@ -503,10 +503,6 @@ function MultiLineEditTextView(options) {
 		return new Array(self.getRemainingTabWidth(col)).join(expandChar);
 	};
 
-	this.getStringLength = function(s) {
-		return self.isPreviewMode() ? colorCodes.enigmaStrLen(s) : s.length;
-	};
-
 	this.wordWrapSingleLine = function(s, tabHandling, width) {
 		if(!_.isNumber(width)) {
 			width = self.dimens.width;
@@ -555,10 +551,6 @@ function MultiLineEditTextView(options) {
 	this.setAnsiWithOptions = function(ansi, options, cb) {
 
 		function setLines(text) {
-			/*
-			self.setTextLines( strUtil.splitTextAtTerms(text), 0 );
-			self.cursorStartOfDocument();
-			*/
 			text = strUtil.splitTextAtTerms(text);
 
 			let index = 0;
diff --git a/mods/upload.js b/mods/upload.js
index d8887193..5c5fd5b2 100644
--- a/mods/upload.js
+++ b/mods/upload.js
@@ -15,7 +15,6 @@ const pathWithTerminatingSeparator		= require('../core/file_util.js').pathWithTe
 const Log								= require('../core/logger.js').log;
 const Errors							= require('../core/enig_error.js').Errors;
 const FileEntry							= require('../core/file_entry.js');
-const enigmaToAnsi						= require('../core/color_codes.js').enigmaToAnsi;
 
 //	deps
 const async								= require('async');