#2100 fix and cluster by connection fix #2229

Merged
merged 8 commits into from Oct 25, 2016

Projects

None yet

3 participants

@CapitanMorgan
Contributor
CapitanMorgan commented Oct 24, 2016 edited

Fixes #2100, and makes the zoom button on network behave in the more expected fashion. Did this by defining a viewCenter for the canvas, changed the Zoom In/Out buttons function to mirror that of the scroll zoom function. Also fixes an error found with clusterByConnection leaving phantomEdges on the screen. In addition updated a test that fails when you rebuild the library and rerun the tests.

A generic example with the current vis.js combined distributable files
https://jsfiddle.net/p72kewye/35/

A generic example with the proposed changes to the vis.js combined distributable files.
https://jsfiddle.net/xzvxsLjh/1/

test/DataView.test.js
@@ -200,7 +200,7 @@ describe('DataView', function () {
}]
]);
assert.deepEqual(viewUpdates, [
- ['update', {items: [2], data: [{id: 2, title: 'Item 2 (changed)'}]}]
+ ['update', {items: [2], data: [{id: 2, title: 'Item 2 (changed)'}],oldData: [{"group": 2, "id": 2, "title": "Item 2"}]}]
@mojoaxel
mojoaxel Oct 25, 2016 Member

This is actually part of #2174. Thx!

@mojoaxel

The indent does not look good. Can you please recheck and make sure that you use an indent of zwo space. Thanks!

@mojoaxel
Member

@CapitanMorgan By the way: Thanks very much for this bugfix!!

@CapitanMorgan
Contributor

Fixed spacing, and a few other style items.

@mojoaxel mojoaxel merged commit 91c96ba into almende:develop Oct 25, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment