diff --git a/lib/colors.js b/lib/colors.js index 74272ba8..7ca90fa9 100644 --- a/lib/colors.js +++ b/lib/colors.js @@ -185,10 +185,10 @@ colors.zalgo = require('./custom/zalgo'); // maps colors.maps = {}; -colors.maps.america = require('./maps/america'); -colors.maps.zebra = require('./maps/zebra'); -colors.maps.rainbow = require('./maps/rainbow'); -colors.maps.random = require('./maps/random'); +colors.maps.america = require('./maps/america')(colors); +colors.maps.zebra = require('./maps/zebra')(colors); +colors.maps.rainbow = require('./maps/rainbow')(colors); +colors.maps.random = require('./maps/random')(colors); for (var map in colors.maps) { (function(map) { diff --git a/lib/maps/america.js b/lib/maps/america.js index 86700529..dc969033 100644 --- a/lib/maps/america.js +++ b/lib/maps/america.js @@ -1,6 +1,4 @@ -var colors = require('../colors'); - -module['exports'] = (function() { +module['exports'] = function(colors) { return function(letter, i, exploded) { if (letter === ' ') return letter; switch (i%3) { @@ -9,4 +7,4 @@ module['exports'] = (function() { case 2: return colors.blue(letter); } }; -})(); +}; diff --git a/lib/maps/rainbow.js b/lib/maps/rainbow.js index 4e7ef006..2b00ac0a 100644 --- a/lib/maps/rainbow.js +++ b/lib/maps/rainbow.js @@ -1,6 +1,4 @@ -var colors = require('../colors'); - -module['exports'] = (function() { +module['exports'] = function(colors) { // RoY G BiV var rainbowColors = ['red', 'yellow', 'green', 'blue', 'magenta']; return function(letter, i, exploded) { @@ -10,5 +8,5 @@ module['exports'] = (function() { return colors[rainbowColors[i++ % rainbowColors.length]](letter); } }; -})(); +}; diff --git a/lib/maps/random.js b/lib/maps/random.js index 88219daf..cf93df2a 100644 --- a/lib/maps/random.js +++ b/lib/maps/random.js @@ -1,6 +1,4 @@ -var colors = require('../colors'); - -module['exports'] = (function() { +module['exports'] = function(colors) { var available = ['underline', 'inverse', 'grey', 'yellow', 'red', 'green', 'blue', 'white', 'cyan', 'magenta']; return function(letter, i, exploded) { @@ -9,4 +7,4 @@ module['exports'] = (function() { available[Math.round(Math.random() * (available.length - 2))] ](letter); }; -})(); +}; diff --git a/lib/maps/zebra.js b/lib/maps/zebra.js index 28938c02..fa736235 100644 --- a/lib/maps/zebra.js +++ b/lib/maps/zebra.js @@ -1,5 +1,5 @@ -var colors = require('../colors'); - -module['exports'] = function(letter, i, exploded) { - return i % 2 === 0 ? letter : colors.inverse(letter); +module['exports'] = function(colors) { + return function(letter, i, exploded) { + return i % 2 === 0 ? letter : colors.inverse(letter); + }; };