Skip to content
This repository was archived by the owner on Jul 29, 2019. It is now read-only.

Fix click and doubleclick events on items #2988

Merged
merged 36 commits into from
May 3, 2017
Merged
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
dcb2d58
Fix redraw order
yotamberk Dec 2, 2016
582fc64
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Dec 6, 2016
f96e6bf
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Dec 8, 2016
ffa8e0e
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Dec 17, 2016
2f04345
Fix error when option is not defined
yotamberk Dec 20, 2016
3cfa8d0
Allow template labels
yotamberk Dec 22, 2016
aee0fb3
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Dec 22, 2016
4681ace
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Dec 23, 2016
e9d1ebf
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Dec 31, 2016
cd37b2d
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Dec 31, 2016
9a27aa7
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Jan 5, 2017
4982679
Add .travis.yml file
yotamberk Jan 5, 2017
b9144d3
Add experiment travis code
yotamberk Jan 5, 2017
001fd9f
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Jan 15, 2017
e504dc7
Merge branch 'develop' of https://github.com/yotamberk/vis into develop
yotamberk Jan 15, 2017
ada1c90
Fix react example
yotamberk Jan 15, 2017
3124d8e
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Jan 27, 2017
4870ad2
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Feb 11, 2017
fae21a0
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Feb 15, 2017
91c2c31
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Mar 4, 2017
ea1d8c1
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Mar 18, 2017
af16ffc
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Apr 11, 2017
099a8e7
Merge branch 'develop' of https://github.com/almende/vis into develop
yotamberk Apr 14, 2017
0362af6
Fix item click and doubleclick
yotamberk Apr 16, 2017
608c4da
Remove new empty line
yotamberk Apr 16, 2017
914937b
Return id of item tapped
yotamberk Apr 16, 2017
9973b6e
Merge branch 'develop' into fix-click-item
yotamberk Apr 16, 2017
91eba11
Merge branch 'develop' into fix-click-item
yotamberk Apr 17, 2017
5ea07e1
Merge branch 'develop' into fix-click-item
yotamberk Apr 28, 2017
8fefd5a
Merge branch 'develop' into fix-click-item
yotamberk Apr 30, 2017
2d99aca
Merge branch 'develop' into fix-click-item
yotamberk Apr 30, 2017
2bf3f43
Merge branch 'develop' into fix-click-item
yotamberk May 1, 2017
fe000da
Fix comments from Review
yotamberk May 3, 2017
eaaa9dc
Merge branch 'develop' of https://github.com/almende/vis into fix-cli…
yotamberk May 3, 2017
527512a
Merge branch 'fix-click-item' of https://github.com/yotamberk/vis int…
yotamberk May 3, 2017
96029f8
Add missing semicolon
yotamberk May 3, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions lib/timeline/component/item/Item.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,25 @@ Item.prototype.repositionY = function() {
Item.prototype._repaintDragCenter = function () {
if (this.selected && this.options.editable.updateTime && !this.dom.dragCenter) {
var me = this;

// create and show drag area
var dragCenter = document.createElement('div');
dragCenter.className = 'vis-drag-center';
dragCenter.dragCenterItem = this;
var hammer = new Hammer(dragCenter);

new Hammer(dragCenter).on('doubletap', function (event) {
hammer.on('tap', function (event) {
me.parent.itemSet.body.emitter.emit('click', {
event: event,
item: me.id
});
});
hammer.on('doubletap', function (event) {
event.stopPropagation();
me.parent.itemSet._onUpdateItem(me);
me.parent.itemSet.body.emitter.emit('doubleClick', {
event: event,
item: me.id
});
});

if (this.dom.box) {
Expand Down Expand Up @@ -370,7 +380,6 @@ Item.prototype._updateContents = function (element) {
throw new Error('Property "content" missing in item ' + this.id);
}
}

this.content = content;
}
}
Expand Down