clean up old uses of init.

src/cell.js

@@ -247,10 +247,7 @@ ColSpanCell.prototype.draw = function(){
   return '';
 };
 
-ColSpanCell.prototype.init = function(tableOptions,x,y){
-  this.x = x;
-  this.y = y;
-};
+ColSpanCell.prototype.init = function(tableOptions){};
 
 
 /**
@@ -263,7 +260,8 @@ function RowSpanCell(originalCell){
   this.originalCell = originalCell;
 }
 
-RowSpanCell.prototype.init = function(tableOptions,x,y){
+RowSpanCell.prototype.init = function(tableOptions){
+  var y = this.y;
   var originalY = this.originalCell.y;
   this.cellOffset = y - originalY;
   this.offset = findDimension(tableOptions.rowHeights,originalY,this.cellOffset);

src/layout-manager.js

@@ -1,6 +1,7 @@
 var _ = require('lodash');
 var Cell = require('./cell');
 var RowSpanCell = Cell.RowSpanCell;
+var ColSpanCell = Cell.ColSpanCell;
 
 (function(){
 
@@ -96,7 +97,10 @@ function addColSpanCells(cellRows){
     for (var columnIndex = 0; columnIndex < cellColumns.length; columnIndex++) {
       var cell = cellColumns[columnIndex];
       for (var k = 1; k < cell.colSpan; k++) {
-        cellColumns.splice(columnIndex + 1, 0, new Cell.ColSpanCell());
+        var colSpanCell = new ColSpanCell();
+        colSpanCell.x = cell.x + k;
+        colSpanCell.y = cell.y;
+        cellColumns.splice(columnIndex + 1, 0, colSpanCell);
       }
     }
   }

src/table.js

@@ -35,7 +35,7 @@ Table.prototype.toString = function(){
 
   _.forEach(cells,function(row,rowIndex){
     _.forEach(row,function(cell,cellIndex){
-      cell.init(this.options,cellIndex,rowIndex);
+      cell.init(this.options);
     },this);
   },this);
 

test/cell-test.js

@@ -343,7 +343,7 @@ describe('Cell',function(){
         cell = new Cell();
         cell.y=1;
         cell.mergeTableOptions(tableOptions);
-        cell.init(tableOptions,0,1);
+        cell.init(tableOptions);
         expect(cell.height).to.equal(10);
 
         cell = new Cell();
@@ -812,49 +812,63 @@ describe('Cell',function(){
 
     it('drawing top of the next row',function(){
       var spanner = new RowSpanCell(original);
-      spanner.init(tableOptions,0,1);
+      spanner.x = 0;
+      spanner.y = 1;
+      spanner.init(tableOptions);
       spanner.draw('top');
       expect(original.draw).to.have.been.calledOnce.and.calledWith(2);
     });
 
     it('drawing line 0 of the next row',function(){
       var spanner = new RowSpanCell(original);
-      spanner.init(tableOptions,0,1);
+      spanner.x = 0;
+      spanner.y = 1;
+      spanner.init(tableOptions);
       spanner.draw(0);
       expect(original.draw).to.have.been.calledOnce.and.calledWith(3);
     });
 
     it('drawing line 1 of the next row',function(){
       var spanner = new RowSpanCell(original);
-      spanner.init(tableOptions,0,1);
+      spanner.x  = 0;
+      spanner.y = 1;
+      spanner.init(tableOptions);
       spanner.draw(1);
       expect(original.draw).to.have.been.calledOnce.and.calledWith(4);
     });
 
     it('drawing top of two rows below',function(){
       var spanner = new RowSpanCell(original);
-      spanner.init(tableOptions,0,2);
+      spanner.x = 0;
+      spanner.y = 2;
+      spanner.init(tableOptions);
       spanner.draw('top');
       expect(original.draw).to.have.been.calledOnce.and.calledWith(6);
     });
 
     it('drawing line 0 of two rows below',function(){
       var spanner = new RowSpanCell(original);
-      spanner.init(tableOptions,0,2);
+      spanner.x = 0;
+      spanner.y = 2;
+      spanner.init(tableOptions);
       spanner.draw(0);
       expect(original.draw).to.have.been.calledOnce.and.calledWith(7);
     });
 
     it('drawing line 1 of two rows below',function(){
       var spanner = new RowSpanCell(original);
-      spanner.init(tableOptions,0,2);
+      spanner.x = 0;
+      spanner.y = 2;
+      spanner.init(tableOptions);
       spanner.draw(1);
       expect(original.draw).to.have.been.calledOnce.and.calledWith(8);
     });
 
     it('drawing bottom',function(){
       var spanner = new RowSpanCell(original);
-      spanner.init(tableOptions,0,1);
+      spanner.x = 0;
+      spanner.y = 1;
+      spanner.init(tableOptions);
       spanner.draw('bottom');
       expect(original.draw).to.have.been.calledOnce.and.calledWith('bottom');
     });