Merge branch 'develop' of github.com:almende/vis into develop

HISTORY.md

@@ -6,13 +6,14 @@ http://visjs.org
 
 ### Network
 
+- Added options to customize the hierarchical layout without the use of physics.
 - 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.
 - Fixed #1334 (again): Network now ignores scroll when interaction:zoomView is false.
-- Added options to customize the hierarchical layout without the use of physics.
 - Fixed #1588: destroy now unsubscribed from the dataset.
+- Fixed #1584: Navigation buttons broken.
 
 ### Graph2d
 

lib/hammerUtil.js

@@ -7,23 +7,14 @@ var Hammer = require('./module/hammer');
  */
 exports.onTouch = function (hammer, callback) {
   callback.inputHandler = function (event) {
-    if (event.isFirst && !isTouching) {
+    if (event.isFirst) {
       callback(event);
-
-      isTouching = true;
-      setTimeout(function () {
-        isTouching = false;
-      }, 0);
     }
   };
 
   hammer.on('hammer.input', callback.inputHandler);
 };
 
-// isTouching is true while a touch action is being emitted
-// this is a hack to prevent `touch` from being fired twice
-var isTouching = false;
-
 /**
  * Register a release event, taking place after a gesture
  * @param {Hammer} hammer       A hammer instance
@@ -31,13 +22,8 @@ var isTouching = false;
  */
 exports.onRelease = function (hammer, callback) {
   callback.inputHandler = function (event) {
-    if (event.isFinal && !isReleasing) {
+    if (event.isFinal) {
       callback(event);
-
-      isReleasing = true;
-      setTimeout(function () {
-        isReleasing = false;
-      }, 0);
     }
   };
 
@@ -45,11 +31,6 @@ exports.onRelease = function (hammer, callback) {
 };
 
 
-// isReleasing is true while a release action is being emitted
-// this is a hack to prevent `release` from being fired twice
-var isReleasing = false;
-
-
 /**
  * Unregister a touch event, taking place before a gesture
  * @param {Hammer} hammer       A hammer instance