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

lib/module/hammer.js

@@ -3,7 +3,9 @@
 if (typeof window !== 'undefined') {
   var propagating = require('propagating-hammerjs');
   var Hammer = window['Hammer'] || require('hammerjs');
-  module.exports = propagating(Hammer);
+  module.exports = propagating(Hammer, {
+    preventDefault: true
+  });
 }
 else {
   module.exports = function () {

lib/network/modules/CanvasRenderer.js

@@ -1,7 +1,3 @@
-/**
- * Created by Alex on 26-Feb-15.
- */
-
 if (typeof window !== 'undefined') {
   window.requestAnimationFrame = window.requestAnimationFrame || window.mozRequestAnimationFrame ||
   window.webkitRequestAnimationFrame || window.msRequestAnimationFrame;

lib/network/modules/Clustering.js

@@ -1,9 +1,5 @@
-/**
- * Created by Alex on 24-Feb-15.
- */
-
 var util = require("../../util");
-import Cluster from './components/nodes/cluster'
+import Cluster from './components/nodes/Cluster'
 
 class ClusterEngine {
   constructor(body) {

lib/network/modules/ConfigurationSystem.js

@@ -1,8 +1,3 @@
-/**
- * Created by Alex on 3/26/2015.
- */
-
-
 var util = require('../../util');
 
 import  ColorPicker from './components/ColorPicker'

lib/network/modules/EdgesHandler.js

@@ -1,8 +1,3 @@
-/**
- * Created by Alex on 3/4/2015.
- */
-
-
 var util = require("../../util");
 var DataSet = require('../../DataSet');
 var DataView = require('../../DataView');

lib/network/modules/InteractionHandler.js

@@ -1,8 +1,3 @@
-/**
- * Created by Alex on 2/27/2015.
- *
- */
-
 let util = require('../../util');
 
 import NavigationHandler from "./components/NavigationHandler"

lib/network/modules/LayoutEngine.js

@@ -1,7 +1,3 @@
-/**
- * Created by Alex on 3/3/2015.
- */
-
 var util = require('../../util');
 
 class LayoutEngine {

lib/network/modules/NodesHandler.js

@@ -1,7 +1,3 @@
-/**
- * Created by Alex on 3/4/2015.
- */
-
 var util = require("../../util");
 var DataSet = require('../../DataSet');
 var DataView = require('../../DataView');

lib/network/modules/PhysicsEngine.js

@@ -1,7 +1,3 @@
-/**
- * Created by Alex on 2/23/2015.
- */
-
 import BarnesHutSolver from './components/physics/BarnesHutSolver';
 import Repulsion from './components/physics/RepulsionSolver';
 import HierarchicalRepulsion from './components/physics/HierarchicalRepulsionSolver';

lib/network/modules/SelectionHandler.js

@@ -1,7 +1,3 @@
-/**
- * Created by Alex on 2/27/2015.
- */
-
 var Node = require("./components/Node");
 var util = require('../../util');
 

lib/network/modules/View.js

@@ -1,7 +1,3 @@
-/**
- * Created by Alex on 26-Feb-15.
- */
-
 var util = require('../../util');
 
 class View {

lib/network/modules/components/colorPicker.js → lib/network/modules/components/ColorPicker.js

@@ -1,7 +1,3 @@
-/**
- * Created by Alex on 3/27/2015.
- */
-
 let Hammer = require('../../../module/hammer');
 let hammerUtil = require('../../../hammerUtil');
 let util = require('../../../util');

lib/network/modules/components/Edge.js

@@ -1,10 +1,10 @@
 var util = require('../../../util');
 
-
-import Label              from './unified/Label.js'
+import Label              from './unified/Label'
 import BezierEdgeDynamic  from './edges/BezierEdgeDynamic'
 import BezierEdgeStatic   from './edges/BezierEdgeStatic'
 import StraightEdge       from './edges/StraightEdge'
+
 /**
  * @class Edge
  *

lib/network/modules/components/Popup.js

@@ -86,14 +86,14 @@ class Popup {
 
   /**
    * Show the popup window
-   * @param {boolean} show    Optional. Show or hide the window
+   * @param {boolean} [doShow]    Show or hide the window
    */
-  show(show) {
-    if (show === undefined) {
-      show = true;
+  show(doShow) {
+    if (doShow === undefined) {
+      doShow = true;
     }
 
-    if (show === true) {
+    if (doShow === true) {
       var height = this.frame.clientHeight;
       var width = this.frame.clientWidth;
       var maxHeight = this.frame.parentNode.clientHeight;

lib/network/modules/components/edges/bezierEdgeDynamic.js → lib/network/modules/components/edges/BezierEdgeDynamic.js

@@ -1,7 +1,3 @@
-/**
- * Created by Alex on 3/20/2015.
- */
-
 import BezierEdgeBase from './util/BezierEdgeBase'
 
 class BezierEdgeDynamic extends BezierEdgeBase {

lib/network/modules/components/edges/bezierEdgeStatic.js → lib/network/modules/components/edges/BezierEdgeStatic.js

@@ -1,7 +1,3 @@
-/**
- * Created by Alex on 3/20/2015.
- */
-
 import BezierEdgeBase from './util/BezierEdgeBase'
 
 class BezierEdgeStatic extends BezierEdgeBase {

lib/network/modules/components/edges/straightEdge.js → lib/network/modules/components/edges/StraightEdge.js

@@ -1,7 +1,3 @@
-/**
- * Created by Alex on 3/20/2015.
- */
-
 import EdgeBase from './util/EdgeBase'
 
 class StraightEdge extends EdgeBase {

lib/network/modules/components/edges/util/BezierEdgeBase.js

@@ -1,7 +1,3 @@
-/**
- * Created by Alex on 3/20/2015.
- */
-
 import EdgeBase from './EdgeBase'
 
 class BezierEdgeBase extends EdgeBase {

lib/network/modules/components/edges/util/EdgeBase.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 3/20/2015.
- */
 let util = require("../../../../../util")
 
 class EdgeBase {

lib/network/modules/components/nodes/shapes/box.js → lib/network/modules/components/nodes/shapes/Box.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 3/18/2015.
- */
 'use strict';
 
 import NodeBase from '../util/NodeBase'

lib/network/modules/components/nodes/shapes/circle.js → lib/network/modules/components/nodes/shapes/Circle.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 3/18/2015.
- */
 'use strict';
 
 import CircleImageBase from '../util/CircleImageBase'

lib/network/modules/components/nodes/shapes/circularImage.js → lib/network/modules/components/nodes/shapes/CircularImage.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 3/18/2015.
- */
 'use strict';
 
 

lib/network/modules/components/nodes/shapes/database.js → lib/network/modules/components/nodes/shapes/Database.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 3/18/2015.
- */
 'use strict';
 
 import NodeBase from '../util/NodeBase'

lib/network/modules/components/nodes/shapes/Diamond.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 3/18/2015.
- */
 'use strict';
 
 import ShapeBase from '../util/ShapeBase'

lib/network/modules/components/nodes/shapes/dot.js → lib/network/modules/components/nodes/shapes/Dot.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 3/18/2015.
- */
 'use strict';
 
 import ShapeBase from '../util/ShapeBase'

lib/network/modules/components/nodes/shapes/ellipse.js → lib/network/modules/components/nodes/shapes/Ellipse.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 3/18/2015.
- */
 'use strict';
 
 import NodeBase from '../util/NodeBase'

lib/network/modules/components/nodes/shapes/empty.js → lib/network/modules/components/nodes/shapes/Empty.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 3/18/2015.
- */
 'use strict';
 
 import NodeBase from '../util/NodeBase'

lib/network/modules/components/nodes/shapes/icon.js → lib/network/modules/components/nodes/shapes/Icon.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 3/18/2015.
- */
 'use strict';
 
 import NodeBase from '../util/NodeBase'

lib/network/modules/components/nodes/shapes/image.js → lib/network/modules/components/nodes/shapes/Image.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 3/18/2015.
- */
 'use strict';
 
 import CircleImageBase from '../util/CircleImageBase'

lib/network/modules/components/nodes/shapes/square.js → lib/network/modules/components/nodes/shapes/Square.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 3/18/2015.
- */
 'use strict';
 
 import ShapeBase from '../util/ShapeBase'

lib/network/modules/components/nodes/shapes/star.js → lib/network/modules/components/nodes/shapes/Star.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 3/18/2015.
- */
 'use strict';
 
 import ShapeBase from '../util/ShapeBase'

lib/network/modules/components/nodes/shapes/text.js → lib/network/modules/components/nodes/shapes/Text.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 3/18/2015.
- */
 'use strict';
 
 import NodeBase from '../util/NodeBase'

lib/network/modules/components/nodes/shapes/Triangle.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 3/18/2015.
- */
 'use strict';
 
 import ShapeBase from '../util/ShapeBase'

lib/network/modules/components/nodes/shapes/triangleDown.js → lib/network/modules/components/nodes/shapes/TriangleDown.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 3/18/2015.
- */
 'use strict';
 
 import ShapeBase from '../util/ShapeBase'

lib/network/modules/components/nodes/util/CircleImageBase.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 3/19/2015.
- */
 import NodeBase from '../util/NodeBase'
 
 class CircleImageBase extends NodeBase {

lib/network/modules/components/nodes/util/NodeBase.js

@@ -1,7 +1,3 @@
-/**
- * Created by Alex on 3/19/2015.
- */
-
 class NodeBase {
   constructor(options, body, labelModule) {
     this.body = body;

lib/network/modules/components/nodes/util/ShapeBase.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 3/19/2015.
- */
 import NodeBase from '../util/NodeBase'
 
 class ShapeBase extends NodeBase {

lib/network/modules/components/physics/BarnesHutSolver.js

@@ -1,7 +1,3 @@
-/**
- * Created by Alex on 2/23/2015.
- */
-
 class BarnesHutSolver {
   constructor(body, physicsBody, options) {
     this.body = body;

lib/network/modules/components/physics/CentralGravitySolver.js

@@ -1,7 +1,3 @@
-/**
- * Created by Alex on 2/23/2015.
- */
-
 class CentralGravitySolver {
   constructor(body, physicsBody, options) {
     this.body = body;

lib/network/modules/components/physics/HierarchicalRepulsionSolver.js

@@ -1,7 +1,3 @@
-/**
- * Created by Alex on 2/23/2015.
- */
-
 class HierarchicalRepulsionSolver {
   constructor(body, physicsBody, options) {
     this.body = body;

lib/network/modules/components/physics/HierarchicalSpringSolver.js

@@ -1,7 +1,3 @@
-/**
- * Created by Alex on 2/25/2015.
- */
-
 class HierarchicalSpringSolver {
   constructor(body, physicsBody, options) {
     this.body = body;

lib/network/modules/components/physics/RepulsionSolver.js

@@ -1,7 +1,3 @@
-/**
- * Created by Alex on 2/23/2015.
- */
-
 class RepulsionSolver {
   constructor(body, physicsBody, options) {
     this.body = body;

lib/network/modules/components/physics/SpringSolver.js

@@ -1,7 +1,3 @@
-/**
- * Created by Alex on 2/23/2015.
- */
-
 class SpringSolver {
   constructor(body, physicsBody, options) {
     this.body = body;

lib/network/modules/components/unified/label.js → lib/network/modules/components/unified/Label.js

@@ -1,9 +1,5 @@
 let util = require('../../../../util');
 
-/**
- * Created by Alex on 3/17/2015.
- */
-
 class Label {
   constructor(body,options) {
     this.body = body;

lib/timeline/DateUtil.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 10/3/2014.
- */
 var moment = require('../module/moment');
 
 

lib/timeline/Range.js

@@ -368,8 +368,6 @@ Range.prototype._onDragStart = function(event) {
   if (this.body.dom.root) {
     this.body.dom.root.style.cursor = 'move';
   }
-
-  event.preventDefault();
 };
 
 /**
@@ -421,8 +419,6 @@ Range.prototype._onDrag = function (event) {
     end:   new Date(this.end),
     byUser: true
   });
-
-  event.preventDefault();
 };
 
 /**
@@ -565,8 +561,6 @@ Range.prototype._onPinch = function (event) {
 
   this.startToFront = false; // revert to default
   this.endToFront = true; // revert to default
-
-  event.preventDefault();
 };
 
 /**

lib/timeline/component/CustomTime.js

@@ -83,9 +83,10 @@ CustomTime.prototype._create = function() {
   this.hammer.on('panstart', this._onDragStart.bind(this));
   this.hammer.on('panmove',  this._onDrag.bind(this));
   this.hammer.on('panend',   this._onDragEnd.bind(this));
-  this.hammer.on('pan',   function (event) {
-    event.preventDefault();
-  });
+  // TODO: cleanup
+  //this.hammer.on('pan',   function (event) {
+  //  event.preventDefault();
+  //});
 };
 
 /**
@@ -162,7 +163,6 @@ CustomTime.prototype._onDragStart = function(event) {
   this.eventParams.customTime = this.customTime;
 
   event.stopPropagation();
-  event.preventDefault();
 };
 
 /**
@@ -185,7 +185,6 @@ CustomTime.prototype._onDrag = function (event) {
   });
 
   event.stopPropagation();
-  event.preventDefault();
 };
 
 /**
@@ -203,7 +202,6 @@ CustomTime.prototype._onDragEnd = function (event) {
   });
 
   event.stopPropagation();
-  event.preventDefault();
 };
 
 module.exports = CustomTime;

lib/timeline/component/ItemSet.js

@@ -1167,7 +1167,6 @@ ItemSet.prototype._onDragStart = function (event) {
     }
 
     event.stopPropagation();
-    event.preventDefault();
   }
 };
 
@@ -1177,8 +1176,6 @@ ItemSet.prototype._onDragStart = function (event) {
  * @private
  */
 ItemSet.prototype._onDrag = function (event) {
-  event.preventDefault();
-
   if (this.touchParams.itemProps) {
     var me = this;
     var snap = this.options.snap || null;

lib/timeline/component/graph2d_types/bar.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 11/11/2014.
- */
 var DOMutil = require('../../../DOMutil');
 var Points = require('./points');
 

lib/timeline/component/graph2d_types/line.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 11/11/2014.
- */
 var DOMutil = require('../../../DOMutil');
 var Points = require('./points');
 

lib/timeline/component/graph2d_types/points.js

@@ -1,6 +1,3 @@
-/**
- * Created by Alex on 11/11/2014.
- */
 var DOMutil = require('../../../DOMutil');
 
 function Points(groupId, options) {

lib/timeline/component/item/Item.js

@@ -141,7 +141,6 @@ Item.prototype._repaintDeleteButton = function (anchor) {
     new Hammer(deleteButton).on('tap', function (event) {
       me.parent.removeFromDataSet(me);
       event.stopPropagation();
-      event.preventDefault();
     });
 
     anchor.appendChild(deleteButton);

lib/timeline/component/item/RangeItem.js

@@ -249,13 +249,6 @@ RangeItem.prototype._repaintDragLeft = function () {
     dragLeft.className = 'drag-left';
     dragLeft.dragLeftItem = this;
 
-    //// TODO: this should be redundant?
-    //Hammer(dragLeft, {
-    //  preventDefault: true
-    //}).on('drag', function () {
-    //      //console.log('drag left')
-    //    });
-
     this.dom.box.appendChild(dragLeft);
     this.dom.dragLeft = dragLeft;
   }
@@ -279,13 +272,6 @@ RangeItem.prototype._repaintDragRight = function () {
     dragRight.className = 'drag-right';
     dragRight.dragRightItem = this;
 
-    //// TODO: this should be redundant?
-    //Hammer(dragRight, {
-    //  preventDefault: true
-    //}).on('drag', function () {
-    //  //console.log('drag right')
-    //});
-
     this.dom.box.appendChild(dragRight);
     this.dom.dragRight = dragRight;
   }

package.json

@@ -32,7 +32,7 @@
     "hammerjs": "^2.0.4",
     "keycharm": "^0.2.0",
     "moment": "^2.9.0",
-    "propagating-hammerjs": "^1.2.0"
+    "propagating-hammerjs": "^1.3.0"
   },
   "devDependencies": {
     "6to5": "^3.5.3",