diff --git a/lib/module/hammer.js b/lib/module/hammer.js index 05ef2956..120e6ef9 100644 --- a/lib/module/hammer.js +++ b/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 () { diff --git a/lib/timeline/Range.js b/lib/timeline/Range.js index 758a6849..38982d72 100644 --- a/lib/timeline/Range.js +++ b/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(); }; /** diff --git a/lib/timeline/component/CustomTime.js b/lib/timeline/component/CustomTime.js index f6292165..aec7777b 100644 --- a/lib/timeline/component/CustomTime.js +++ b/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; diff --git a/lib/timeline/component/ItemSet.js b/lib/timeline/component/ItemSet.js index 7c643c98..afdcf090 100644 --- a/lib/timeline/component/ItemSet.js +++ b/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; diff --git a/lib/timeline/component/item/Item.js b/lib/timeline/component/item/Item.js index d1819498..9b1e327e 100644 --- a/lib/timeline/component/item/Item.js +++ b/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); diff --git a/lib/timeline/component/item/RangeItem.js b/lib/timeline/component/item/RangeItem.js index 61696124..c04c3765 100644 --- a/lib/timeline/component/item/RangeItem.js +++ b/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; } diff --git a/package.json b/package.json index 39dbf275..f84210b1 100644 --- a/package.json +++ b/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",