cleaned up the .js files a bit

Author: jazzychad

consolelog.js

@@ -12,7 +12,7 @@
  * Prefixes and postfixes can either be strings or functions that
  * return strings. 
  *
- * See documentation for more info.
+ * See documentation in README for more info.
  *
  * by Chad Etzel - December 11, 2009
  *
@@ -100,6 +100,10 @@ var setErrorColor = function(color) {
     setColor("error", color);
 };
 
+var setDodad = function(type, dodad) {
+    dodads[type] = dodad;  
+};
+
 var setLogPrefix = function(prefix) {
     setDodad("standard_prefix", prefix);
 };
@@ -146,10 +150,6 @@ var setAllPostfix = function(postfix) {
     setErrorPostfix(postfix);
 };
 
-var setDodad = function(type, dodad) {
-    dodads[type] = dodad;  
-};
-
 var restoreDefaultColors = function() {
     setLogColor(logColorsDefaults.standard);
     setInfoColor(logColorsDefaults.info);
@@ -194,15 +194,15 @@ var dolog = function(type, msg, color, bg, attr) {
     tc.terminalSetFontAttr(tc.attrs.RESET);
     tc.terminalSetFont(color, bg, attr);
     var prefix, postfix;
-    if (typeof dodads[type + "_prefix"] == "string") {
-        prefix = dodads[type + "_prefix"];
-    } else {
+    if (typeof dodads[type + "_prefix"] == "function") {
         prefix = dodads[type + "_prefix"]();
-    }
-    if (typeof dodads[type + "_postfix"] == "string") {
-        postfix = dodads[type + "_postfix"];
     } else {
+        prefix = dodads[type + "_prefix"];
+    }
+    if (typeof dodads[type + "_postfix"] == "function") {
         postfix = dodads[type + "_postfix"]();
+    } else {
+        postfix = dodads[type + "_postfix"];
     }
 
     sys.puts(prefix + msg + postfix);
@@ -225,11 +225,6 @@ var error = function(msg) {
     dolog("error", msg, logColors.error, tc.colors.RESET, logAttrs.error);
 };
 
-/*
-var puts = function(msg) {
-    log(msg);
-}
-*/
 var puts = log;
 
 var test = function() {

example.js

@@ -32,6 +32,8 @@ cl.log("8 + 8 = " + (8 + 8));
 cl.puts('consolelog.puts is aliased to log for convenience');
 cl.info("node.js is nifty");
 
+cl.setLogPrefix("log: ");
+cl.log("this message has a new prefix string");
 
 cl.setAllPrefix(function() {
         var d = Date.now();

termcolors.js

@@ -6,7 +6,7 @@
  * I am not an expert in all terminal emulation flavors. I just ported this
  * from my C and PHP termcolor libraries which work the same way.
  *
- * See documentation for more info.
+ * See documentation in README for more info.
  *
  * by Chad Etzel - December 11, 2009
  *
@@ -145,50 +145,10 @@ var test = function(reset) {
 };
 
 /*
-resetTerminal();
-sys.puts("\033[34;22;49m# !\033[39;0;49m ");
-sys.puts("normal");
-sys.puts("\033[36m@@@@");
-sys.puts("\033[0m@@@@@");
-sys.puts("\033[47m@@ee@@");
-sys.puts("");
-terminalFontReset();
-terminalSetFont(colors.YELLOW, colors.RED, attrs.DEFAULT);
-//terminalSetFontColor(colors.YELLOW);
-//terminalSetFontBG(colors.RED);
-sys.puts("HELLO!!!!!");
-sys.puts("");
-terminalFontReset();
-terminalSetFont(colors.YELLOW, colors.RED, attrs.BRIGHT);
-sys.puts("HELLO!!!!!");
-sys.puts("");
-terminalFontReset();
-terminalSetFont(colors.YELLOW, colors.RED, attrs.DIM);
-sys.puts("HELLO!!!!!");
-sys.puts("");
-terminalFontReset();
-terminalSetFont(colors.YELLOW, colors.RED, attrs.UNDERLINE);
-sys.puts("HELLO!!!!!");
-sys.puts("");
-terminalFontReset();
-terminalSetFont(colors.YELLOW, colors.RED, attrs.BLINK);
-sys.puts("HELLO!!!!!");
-sys.puts("");
-terminalFontReset();
-terminalSetFont(colors.YELLOW, colors.RED, attrs.REVERSE);
-sys.puts("HELLO!!!!!");
-sys.puts("");
-terminalFontReset();
-terminalSetFont(colors.YELLOW, colors.RED, attrs.HIDDEN);
-sys.puts("HELLO!!!!!");
-sys.puts("");
-terminalFontReset();
+test();
 */
 
 
-//test();
-
-
 
 /* exports */