Merge pull request #729 from palantir/update-d3-definitions

Update d3 definitions
palantir · Jul 22, 2014 · d06eeb4 · d06eeb4
2 parents 2383361 + ec032c4
commit d06eeb4
Show file tree

Hide file tree

Showing 6 changed files with 231 additions and 95 deletions.
diff --git a/plottable.d.ts b/plottable.d.ts
@@ -2214,7 +2214,7 @@ declare module Plottable {
 declare module Plottable {
     module Core {
         interface IKeyEventListenerCallback {
-            (e: D3.Event): any;
+            (e: D3.D3Event): any;
         }
         module KeyEventListener {
             function initialize(): void;

diff --git a/src/interactions/keyEventListener.ts b/src/interactions/keyEventListener.ts
@@ -3,7 +3,7 @@
 module Plottable {
 export module Core {
   export interface IKeyEventListenerCallback {
-    (e: D3.Event): any
+    (e: D3.D3Event): any
   }
 
   export module KeyEventListener {

diff --git a/src/interactions/keyInteraction.ts b/src/interactions/keyInteraction.ts
@@ -28,7 +28,7 @@ export module Interaction {
         this.activated = false;
       });
 
-      Core.KeyEventListener.addCallback(this.keyCode, (e: D3.Event) => {
+      Core.KeyEventListener.addCallback(this.keyCode, (e: D3.D3Event) => {
         if (this.activated && this._callback != null) {
           this._callback();
         }

diff --git a/test/interactions/interactionTests.ts b/test/interactions/interactionTests.ts
@@ -3,8 +3,8 @@
 var assert = chai.assert;
 
 
-function makeFakeEvent(x: number, y: number): D3.Event {
-  return {
+function makeFakeEvent(x: number, y: number): D3.D3Event {
+  return <D3.D3Event> <any> {
       dx: 0,
       dy: 0,
       clientX: x,

diff --git a/tsd.json b/tsd.json
@@ -8,7 +8,7 @@
       "commit": "16dd1ab76fb4c65e532ca820dd45c875636521b6"
     },
     "d3/d3.d.ts": {
-      "commit": "16dd1ab76fb4c65e532ca820dd45c875636521b6"
+      "commit": "f2ce08f2bf86d5f234dd180318ea790512ec41e5"
     },
     "mocha/mocha.d.ts": {
       "commit": "16dd1ab76fb4c65e532ca820dd45c875636521b6"