javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-22 21:48:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(reorder): canceled reorder is animated smoothly back

Browse Source 
references #7142
This commit is contained in:
Manu Mtz.-Almeida
2016-07-02 11:33:16 +02:00
parent f1433c6314
commit 8483a439ae
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/item/item-reorder-gesture.ts
View File

@ -113,8 +113,18 @@ export class ItemReorderGesture {
let toIndex = this.lastToIndex;
let fromIndex = indexForItem(this.selectedItemEle);
this.selectedItemEle.classList.remove(ITEM_REORDER_ACTIVE);
this.selectedItemEle = null;
let reorderInactive = () => {
this.selectedItemEle.style.transition = '';
this.selectedItemEle.classList.remove(ITEM_REORDER_ACTIVE);
this.selectedItemEle = null;
};
if (toIndex === fromIndex) {
this.selectedItemEle.style.transition = 'transform 200ms ease-in-out';
setTimeout(reorderInactive, 200);
} else {
reorderInactive();
}
this.list.reorderEmit(fromIndex, toIndex);
}

2
src/components/item/item-reorder.scss
View File

@ -49,7 +49,7 @@ ion-reorder {
.reorder-active {
z-index: 4;
box-shadow: 0 0 10px rgba(0, 0, 0, .5);
box-shadow: 0 0 10px rgba(0, 0, 0, .4);
opacity: .8;
transition: none;