Fix #19: Key function this signature fixed.

Author: spaced

src/main/scala/org/singlespaced/d3js/selection.scala

@@ -70,10 +70,10 @@ trait BaseSelection[Datum, T <: BaseSelection[Datum,T]] extends BaseDom[Datum,T]
 
   def data(): js.Array[Datum] = js.native
   def data[NewDatum](data: js.Array[NewDatum]): Update[NewDatum] = js.native
-  def data[NewDatum](data: js.Array[NewDatum], key: js.ThisFunction2[Datum|NewDatum,js.UndefOr[NewDatum], Int, String]): Update[NewDatum] = js.native
+  def data[NewDatum](data: js.Array[NewDatum], key: js.ThisFunction2[dom.Node|js.Array[NewDatum],js.UndefOr[NewDatum], Int, String]): Update[NewDatum] = js.native
   def data[NewDatum <: Datum](data: js.Array[NewDatum], key: js.Function2[Datum, Int, String]): Update[NewDatum] = js.native
   def data[NewDatum](data: DatumFunction[js.Array[NewDatum]]): Update[NewDatum] = js.native
-  def data[NewDatum](data: DatumFunction[js.Array[NewDatum]], key: js.ThisFunction2[Datum|NewDatum,js.UndefOr[NewDatum], Int, String]): Update[NewDatum] = js.native
+  def data[NewDatum](data: DatumFunction[js.Array[NewDatum]], key: js.ThisFunction2[dom.Node|js.Array[NewDatum],js.UndefOr[NewDatum], Int, String]): Update[NewDatum] = js.native
 
 
   def filter(selector: DatumFunction[Boolean]): T = js.native

src/test/scala/org/singlespaced/d3js/SelectionTest.scala

@@ -25,11 +25,11 @@ object SelectionTest extends TestSuite {
     }
     'd3_dataWithKey_twoLoopsAndThisFunction {
       val sel:Selection[dom.EventTarget]=d3.selectAll("p")
-      val function= { (t: dom.EventTarget | Int ,d:js.UndefOr[Int],i:Int) =>
+      val function= { (t: dom.Node | js.Array[Int] ,d:js.UndefOr[Int],i:Int) =>
         //dom.window.console.log("d is "+d+" and i is "+i+" and this is "+t)
         "a"
       }
-      sel.data[Int](js.Array(5),function).enter().append("p")
+      sel.data[Int](js.Array(5,7,8),function).enter().append("p")
     }
     'd3_dataWithKey_simpleFunction {
       //arrange