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

HISTORY.md

@@ -8,6 +8,8 @@ http://visjs.org
 
 - Altered edges for arrows and added the arrowStrikethrough option.
 - 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
 

dist/vis.js

@@ -11295,10 +11295,11 @@ return /******/ (function(modules) { // webpackBootstrap
         // propagate over all elements (until stopped)
         var elem = _firstTarget;
         while (elem && !stopped) {
-          if(elem.hammer){
+          var elemHammer = elem.hammer;
+          if(elemHammer){
             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++) {
                 _handlers[i](event);
               }

package.json

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