Browse Source

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

codeClimate
Alex de Mulder 8 years ago
parent
commit
73177141ad
3 changed files with 7 additions and 4 deletions
  1. +2
    -0
      HISTORY.md
  2. +4
    -3
      dist/vis.js
  3. +1
    -1
      package.json

+ 2
- 0
HISTORY.md View File

@ -8,6 +8,8 @@ http://visjs.org
- Altered edges for arrows and added the arrowStrikethrough option. - Altered edges for arrows and added the arrowStrikethrough option.
- Improved the hierarchical layout algorithm by adding a condensing method to remove whitespace. - Improved the hierarchical layout algorithm by adding a condensing method to remove whitespace.
- Fixed #1556: Network throwing an error when clicking the "Edit" button
on the manipulation toolbar.
### Graph2d ### Graph2d

+ 4
- 3
dist/vis.js View File

@ -11295,10 +11295,11 @@ return /******/ (function(modules) { // webpackBootstrap
// propagate over all elements (until stopped) // propagate over all elements (until stopped)
var elem = _firstTarget; var elem = _firstTarget;
while (elem && !stopped) { while (elem && !stopped) {
if(elem.hammer){
var elemHammer = elem.hammer;
if(elemHammer){
var _handlers; var _handlers;
for(var k = 0; k < elem.hammer.length; k++){
_handlers = elem.hammer[k]._handlers[event.type];
for(var k = 0; k < elemHammer.length; k++){
_handlers = elemHammer[k]._handlers[event.type];
if(_handlers) for (var i = 0; i < _handlers.length && !stopped; i++) { if(_handlers) for (var i = 0; i < _handlers.length && !stopped; i++) {
_handlers[i](event); _handlers[i](event);
} }

+ 1
- 1
package.json View File

@ -34,7 +34,7 @@
"hammerjs": "^2.0.6", "hammerjs": "^2.0.6",
"keycharm": "^0.2.0", "keycharm": "^0.2.0",
"moment": "^2.10.2", "moment": "^2.10.2",
"propagating-hammerjs": "^1.4.4",
"propagating-hammerjs": "^1.4.5",
"uuid": "^2.0.1", "uuid": "^2.0.1",
"babel": "^5.1.11", "babel": "^5.1.11",
"babel-loader": "^5.0.0", "babel-loader": "^5.0.0",

Loading…
Cancel
Save