Browse Source

Merge remote-tracking branch 'origin/v4' into v4

flowchartTest
jos 9 years ago
parent
commit
48278b921c
4 changed files with 1348 additions and 1348 deletions
  1. +1345
    -1345
      dist/vis.js
  2. +1
    -1
      examples/network/20_navigation.html
  3. +1
    -1
      lib/network/modules/InteractionHandler.js
  4. +1
    -1
      lib/network/modules/components/NavigationHandler.js

+ 1345
- 1345
dist/vis.js
File diff suppressed because it is too large
View File


+ 1
- 1
examples/network/20_navigation.html View File

@ -104,7 +104,7 @@
edges: edges edges: edges
}; };
var options = { var options = {
interaction:{showNavigationIcons: true},
interaction:{navigationButtons: true},
}; };
network = new vis.Network(container, data, options); network = new vis.Network(container, data, options);

+ 1
- 1
lib/network/modules/InteractionHandler.js View File

@ -39,7 +39,7 @@ class InteractionHandler {
dragView: true, dragView: true,
zoomView: true, zoomView: true,
hoverEnabled: false, hoverEnabled: false,
showNavigationIcons: false,
navigationButtons: false,
tooltip: { tooltip: {
delay: 300, delay: 300,
fontColor: '#000000', fontColor: '#000000',

+ 1
- 1
lib/network/modules/components/NavigationHandler.js View File

@ -31,7 +31,7 @@ class NavigationHandler {
} }
create() { create() {
if (this.options.showNavigationIcons === true) {
if (this.options.navigationButtons === true) {
if (this.iconsCreated === false) { if (this.iconsCreated === false) {
this.loadNavigationElements(); this.loadNavigationElements();
} }

Loading…
Cancel
Save