fix(item): sliding item is closed when tapped

closes #7094
ionic-team · Jun 29, 2016 · 7aa559a · 7aa559a
1 parent 4fff262
commit 7aa559a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/components/item/item-sliding-gesture.ts b/src/components/item/item-sliding-gesture.ts
@@ -21,7 +21,7 @@ export class ItemSlidingGesture extends DragGesture {
   }
 
   onTapCallback(ev: any) {
-    if (isFromOptionButtons(ev.target)) {
+    if (isFromOptionButtons(ev)) {
       return;
     }
     let didClose = this.closeOpened();
@@ -117,6 +117,10 @@ function getContainer(ev: any): ItemSliding {
   return null;
 }
 
-function isFromOptionButtons(ele: HTMLElement): boolean {
-  return !!closest(ele, 'ion-item-options', true);
+function isFromOptionButtons(ev: any): boolean {
+  let button = closest(ev.target, '.button', true);
+  if (!button) {
+    return false;
+  }
+  return !!closest(button, 'ion-item-options', true);
 }
diff --git a/src/components/item/item-sliding.ts b/src/components/item/item-sliding.ts
@@ -252,7 +252,7 @@ export class ItemSliding {
 
   /**
    * @private
-   */  
+   */
   getSlidingPercent(): number {
     let openAmount = this._openAmount;
     if (openAmount > 0) {
@@ -364,7 +364,7 @@ export class ItemSliding {
       this._timer = null;
     }
     this._openAmount = openAmount;
-    
+
     if (isFinal) {
       this.item.setCssStyle(CSS.transition, '');
 
@@ -380,7 +380,7 @@ export class ItemSliding {
         let state = (openAmount <= (-this._optsWidthLeftSide - SWIPE_MARGIN))
           ? SlidingState.Left | SlidingState.SwipeLeft
           : SlidingState.Left;
-      
+
         this._setState(state);
       }
     }
@@ -392,7 +392,7 @@ export class ItemSliding {
       this.item.setCssStyle(CSS.transform, '');
       return;
     }
- 
+
     this.item.setCssStyle(CSS.transform, `translate3d(${-openAmount}px,0,0)`);
     this.ionDrag.emit(this);
   }

diff --git a/src/components/item/test/sliding/main.html b/src/components/item/test/sliding/main.html
@@ -36,10 +36,10 @@ <h2>HubStruck Notifications</h2>
         </button>
       </ion-item-options>
       <ion-item-options side="right">
-        <button danger (click)="share(item100)">
+        <button danger (click)="unread(item100)">
           <ion-icon name="trash"></ion-icon>
         </button>
-        <button (click)="favorite(item100)" >
+        <button (click)="unread(item100)" >
           <ion-icon name="star"></ion-icon>
         </button>
       </ion-item-options>