From af2c0241faa60446e3b83222bac226d1c0d991c5 Mon Sep 17 00:00:00 2001
From: Qinfeng Chen <qchen@qchen-mbp.local>
Date: Fri, 14 Nov 2014 15:36:03 -0500
Subject: [PATCH 1/3] more typings for sigmajs

---
 sigmajs/sigmajs-tests.ts | 12 ++++++++++++
 sigmajs/sigmajs.d.ts     | 16 ++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/sigmajs/sigmajs-tests.ts b/sigmajs/sigmajs-tests.ts
index da4b100a8..7f00edee7 100644
--- a/sigmajs/sigmajs-tests.ts
+++ b/sigmajs/sigmajs-tests.ts
@@ -14,6 +14,10 @@ module SigmaJsTests {
         container: container
     });
 
+    s.bind('clickNode', (e) => {
+        s.refresh();
+    });
+
     var N = 100;
     var E = 500;
     // Generate a random graph:
@@ -41,4 +45,12 @@ module SigmaJsTests {
     sigma.plugins.dragNodes(s, s.renderers[0]);
     s.renderers[0].resize();
     s.refresh();
+
+    sigma.parsers.json('myGraph.json', s, () => {
+        s.refresh();
+    });
+
+    sigma.parsers.gexf('myGraph.gexf', s, () => {
+        s.refresh();
+    });
 }
diff --git a/sigmajs/sigmajs.d.ts b/sigmajs/sigmajs.d.ts
index 2d04deda0..487e42486 100644
--- a/sigmajs/sigmajs.d.ts
+++ b/sigmajs/sigmajs.d.ts
@@ -28,9 +28,18 @@ declare module SigmaJs{
         target: string;
     }
 
+    interface JsonParser {
+        (target: string, sigma: Sigma, callback: (graph: Sigma) => void): void;
+    }
+
+    interface GexfParser {
+        (target: string, sigma: Sigma, callback: (graph: Sigma) => void): void;
+    }
+
     interface Graph {
         addEdge(edge: Edge): Graph;
         addNode(node: Node): Graph;
+        addMethod(name: string, method: (input: any) => any): void;
         clear(): Graph;
         degree(id: string): number;
         degree(id: string, type: string): number;
@@ -56,6 +65,11 @@ declare module SigmaJs{
         y?: number;
     }
 
+    interface Parsers {
+        gexf: GexfParser;
+        json: JsonParser;
+    }
+
     interface Plugins {
         dragNodes: DragNodes;
     }
@@ -75,6 +89,7 @@ declare module SigmaJs{
     interface Sigma {
         addRenderer(): Renderer;
         addRenderer(configs: RendererConfigs): Renderer;
+        bind(event: string, callback: (e: any) => void): void;
         graph: Graph;
         killRenderer(renderer: string): Sigma;
         killRenderer(renderer: Renderer): Sigma;
@@ -99,6 +114,7 @@ declare module SigmaJs{
         new(configuration: SigmaConfigs): Sigma;
         classes:Classes;
         plugins: Plugins;
+        parsers: Parsers;
     }
 
     interface Settings {

From 1ce2b93c5c1341e4b0d1aa95a4b7223dbba78ad7 Mon Sep 17 00:00:00 2001
From: Qinfeng Chen <qchen@qchen-mbp.local>
Date: Fri, 14 Nov 2014 15:39:26 -0500
Subject: [PATCH 2/3] alphabetize types

---
 sigmajs/sigmajs.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sigmajs/sigmajs.d.ts b/sigmajs/sigmajs.d.ts
index 487e42486..00b696609 100644
--- a/sigmajs/sigmajs.d.ts
+++ b/sigmajs/sigmajs.d.ts
@@ -66,8 +66,8 @@ declare module SigmaJs{
     }
 
     interface Parsers {
-        gexf: GexfParser;
         json: JsonParser;
+        gexf: GexfParser;
     }
 
     interface Plugins {
@@ -113,8 +113,8 @@ declare module SigmaJs{
         new(container: Element): Sigma;
         new(configuration: SigmaConfigs): Sigma;
         classes:Classes;
-        plugins: Plugins;
         parsers: Parsers;
+        plugins: Plugins;
     }
 
     interface Settings {

From 8205d92f1bee84b7014cec93ff5f79c076b1f371 Mon Sep 17 00:00:00 2001
From: Qinfeng Chen <qchen@qchen-mbp.local>
Date: Fri, 14 Nov 2014 18:48:43 -0500
Subject: [PATCH 3/3] adding forceAtlas layout typings

---
 sigmajs/sigmajs-tests.ts | 9 +++++++++
 sigmajs/sigmajs.d.ts     | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/sigmajs/sigmajs-tests.ts b/sigmajs/sigmajs-tests.ts
index 7f00edee7..7163471a6 100644
--- a/sigmajs/sigmajs-tests.ts
+++ b/sigmajs/sigmajs-tests.ts
@@ -53,4 +53,13 @@ module SigmaJsTests {
     sigma.parsers.gexf('myGraph.gexf', s, () => {
         s.refresh();
     });
+
+    s.configForceAtlas2({
+        worker: true
+    });
+
+    s.isForceAtlas2Running();
+    s.killForceAtlas2();
+    s.startForceAtlas2();
+    s.stopForceAtlas2();
 }
diff --git a/sigmajs/sigmajs.d.ts b/sigmajs/sigmajs.d.ts
index 00b696609..dae23464f 100644
--- a/sigmajs/sigmajs.d.ts
+++ b/sigmajs/sigmajs.d.ts
@@ -96,6 +96,14 @@ declare module SigmaJs{
         kill(): void;
         refresh(): void;
         renderers: Renderer[];
+
+        // forceAtlas2 layout
+        configForceAtlas2(configs: { [key: string]: any }): void;
+        isForceAtlas2Running(): boolean;
+        killForceAtlas2(): void;
+        startForceAtlas2(): void;
+        startForceAtlas2(configs: { [key: string]: any }): void;
+        stopForceAtlas2(): void;
     }
 
     interface SigmaConfigs {