javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into css-refactor

Browse Source
This commit is contained in:
Adam Bradley
2015-12-08 12:10:29 -06:00
parent 8ed56efaca f9199fb3be
commit 7a0f5a22ed
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ionic/components/item/item-sliding-gesture.ts
View File

@@ -30,7 +30,9 @@ export class ItemSlidingGesture extends DragGesture {
};
this.mouseOut = (ev) => {
this.onDragEnd(ev);
if (ev.target.tagName === 'ION-ITEM-SLIDING') {
this.onDragEnd(ev);
}
};
}
@@ -54,10 +56,6 @@ export class ItemSlidingGesture extends DragGesture {
this.set(itemContainerEle, 'offsetX', openAmout);
this.set(itemContainerEle, 'startX', ev.center[this.direction]);
if (ev.srcEvent.type.indexOf('mouse') > -1) {
ev.target.addEventListener('mouseout', this.mouseOut);
}
this.dragEnded = false;
}
@@ -87,6 +85,11 @@ export class ItemSlidingGesture extends DragGesture {
newX = -Math.min(-itemData.optsWidth, -itemData.optsWidth + (((delta + itemData.optsWidth) * 0.4)));
}
if (newX > 5 && ev.srcEvent.type.indexOf('mouse') > -1 && !itemData.hasMouseOut) {
itemContainerEle.addEventListener('mouseout', this.mouseOut);
itemData.hasMouseOut = true;
}
raf(() => {
if (!this.dragEnded && !this.preventDrag) {
isItemActive(itemContainerEle, true);
@@ -119,7 +122,8 @@ export class ItemSlidingGesture extends DragGesture {
}
}
ev.target.removeEventListener('mouseout', this.mouseOut);
itemContainerEle.removeEventListener('mouseout', this.mouseOut);
itemData.hasMouseOut = false;
raf(() => {
this.open(itemContainerEle, restingPoint, true);