javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-23 14:01:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(merge): fix merge conflicts

Browse Source
This commit is contained in:
Adam Bradley
2016-05-18 10:58:01 -05:00
parent daa4ccc30c 27c77af7d9
commit 3449059e9f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ export class ItemSlidingGesture extends DragGesture {
}
onDragStart(ev): boolean {
let itemContainerEle = getItemConatiner(ev.target);
let itemContainerEle = getItemContainer(ev.target);
if (!itemContainerEle) {
console.debug('onDragStart, no itemContainerEle');
return false;
@ -77,7 +77,7 @@ export class ItemSlidingGesture extends DragGesture {
return;
}
let itemContainerEle = getItemConatiner(ev.target);
let itemContainerEle = getItemContainer(ev.target);
if (!itemContainerEle || !isActive(itemContainerEle)) {
console.debug('onDrag, no itemContainerEle');
return;
@ -120,7 +120,7 @@ export class ItemSlidingGesture extends DragGesture {
this.preventDrag = false;
this.dragEnded = true;
let itemContainerEle = getItemConatiner(ev.target);
let itemContainerEle = getItemContainer(ev.target);
if (!itemContainerEle || !isActive(itemContainerEle)) {
console.debug('onDragEnd, no itemContainerEle');
return;
@ -234,7 +234,7 @@ function preventDefault(ev) {
ev.preventDefault();
}
function getItemConatiner(ele) {
function getItemContainer(ele) {
return closest(ele, 'ion-item-sliding', true);
}