From 0c4ef2215b3fdf36b619fc3d5fe150ee634aa341 Mon Sep 17 00:00:00 2001 From: Michael Hackstein Date: Fri, 17 May 2013 14:39:35 +0200 Subject: [PATCH] ArangoAdapter now creates a node Reducer --- html/admin/js/graphViewer/graph/arangoAdapter.js | 4 ++++ .../graphViewer/jasmine_test/specAdapter/arangoAdapterSpec.js | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/html/admin/js/graphViewer/graph/arangoAdapter.js b/html/admin/js/graphViewer/graph/arangoAdapter.js index 668948a1a2..d52ec8efa0 100644 --- a/html/admin/js/graphViewer/graph/arangoAdapter.js +++ b/html/admin/js/graphViewer/graph/arangoAdapter.js @@ -54,6 +54,7 @@ function ArangoAdapter(nodes, edges, config) { queries = {}, nodeCollection, edgeCollection, + reducer, arangodb, width, height, @@ -369,6 +370,9 @@ function ArangoAdapter(nodes, edges, config) { + " || e._from == @id" + " RETURN e"; + reducer = new NodeReducer(nodes, edges); + + self.oldLoadNodeFromTreeById = function(nodeId, callback) { sendQuery(queries.nodeById, { id: nodeId diff --git a/html/admin/js/graphViewer/jasmine_test/specAdapter/arangoAdapterSpec.js b/html/admin/js/graphViewer/jasmine_test/specAdapter/arangoAdapterSpec.js index 4c5cb6e1cd..9bb301dbdb 100644 --- a/html/admin/js/graphViewer/jasmine_test/specAdapter/arangoAdapterSpec.js +++ b/html/admin/js/graphViewer/jasmine_test/specAdapter/arangoAdapterSpec.js @@ -258,7 +258,7 @@ height: 40 } ); - expect(window.NodeReducer).wasCalledWith({}); + expect(window.NodeReducer).wasCalledWith(nodes, edges); }); describe('setup correctly', function() {