Remove unnecessary parameters from componentFactory and makeColumn fu…

…nctions
foundation · Feb 11, 2016 · 1d473cf · 1d473cf
1 parent d753610
commit 1d473cf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/lib/componentFactory.js b/lib/componentFactory.js
@@ -1,15 +1,14 @@
 var format = require('util').format;
+var $ = require('cheerio');
 
 /**
  * Returns output for desired custom element
- * @param {object} $ - Instance of Cheerio.
  * @param {object} element - Element as a Cheerio object.
- * @param {string} type - Element type.
  * @returns {string} HTML converted from a custom element to table syntax.
  */
-module.exports = function($, element) {
-  var component = $(element),
-      inner     = $(element).html();
+module.exports = function(element) {
+  var component = $(element);
+  var inner     = $(element).html();
 
   switch (element.name) {
     case this.components.callout:
@@ -40,7 +39,7 @@ module.exports = function($, element) {
       return format('<table class="%s"><tr><td><table><tr><td>%s</td></tr></table></td></tr></table>', classes.join(' '), inner);
 
     case this.components.subcolumns:
-      return this.makeColumn($, component, 'subcolumns');
+      return this.makeColumn(component, 'subcolumns');
 
     case this.components.container:
       var classes = ['container'];
@@ -51,7 +50,7 @@ module.exports = function($, element) {
       return format('<table class="%s"><tbody><tr><td>%s</td></tr></tbody></table>', classes.join(' '), inner);
 
     case this.components.columns:
-      return this.makeColumn($, component, 'columns');
+      return this.makeColumn(component, 'columns');
 
     case this.components.row:
       var classes = ['row'];

diff --git a/lib/inky.js b/lib/inky.js
@@ -1,4 +1,3 @@
-var cheerio = require('cheerio');
 var extend  = require('util')._extend;
 var format  = require('util').format;
 var values  = require('object-values');
@@ -173,7 +172,7 @@ Inky.prototype.scaffoldElements = function($, str) {
   // Replace tags with proper table syntax
   // elMarkup retains the inner html within the markup
   if (element !== undefined) {
-    elMarkup = this.componentFactory($, element);
+    elMarkup = this.componentFactory(element);
     $(element).replaceWith(elMarkup);
   }
   else {

diff --git a/lib/makeColumn.js b/lib/makeColumn.js
@@ -1,13 +1,13 @@
 var format = require('util').format;
+var $ = require('cheerio');
 
 /**
  * Returns output for column elements.
  * @todo This could be refactored to handle both cols and subcols.
- * @param {object} $ - Instance of Cheerio.
  * @param {string} col - Column to format.
  * @param {string} type - Type of column.
  */
-module.exports = function($, col, type) {
+module.exports = function(col, type) {
   var output  = '';
   var inner   = $(col).html();
   var classes = [];